Core/Conditions: Convert npc_spellclick_spells data to condition system. This implements CONDITION_SOURCE_TYPE_SPELL_CLICK_EVENT (previous CONDITION_SOURCE_TYPE_UNUSED_18). Wiki needs to be updated accordingly.
This commit is contained in:
Machiavelli
@@ -0,0 +1,275 @@
|
|||||||
|
# Update a typo in original data entry
|
||||||
|
UPDATE `npc_spellclick_spells` SET `quest_end`=11999 WHERE `npc_entry`=26477 AND `spell_id`=61832 AND `quest_start`=11999;
|
||||||
|
# Delete redundant data with invalid condition type
|
||||||
|
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18;
|
||||||
|
|
||||||
|
# Static Data
|
||||||
|
INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,
|
||||||
|
`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES
|
||||||
|
(18,24752,44363,0,8,0,11460,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,24752,44363,0,9,0,11460,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,25596,45875,0,8,0,11690,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,25596,45875,0,9,0,11690,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,25841,46166,0,8,0,11795,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,25841,46166,0,9,0,11795,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,26200,39996,0,8,0,11960,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,26200,39996,0,9,0,11960,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,26200,61286,0,8,0,11960,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,26200,61286,0,9,0,11960,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,26421,47575,0,8,0,12092,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,26421,47575,0,8,0,12096,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,26421,47575,0,9,0,12092,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,26421,47575,0,9,0,12096,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,26477,47096,0,8,0,11999,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,26477,47096,0,8,0,12000,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,26477,47096,0,9,0,11999,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,26477,47096,0,9,0,12000,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,26477,61286,0,8,0,11999,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,26477,61286,0,8,0,12000,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,26477,61286,0,9,0,11999,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,26477,61286,0,9,0,12000,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,26477,61832,0,8,0,11999,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,26477,61832,0,8,0,12000,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,26477,61832,0,9,0,11999,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,26477,61832,0,9,0,12000,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,27061,47920,0,8,0,12050,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,27061,47920,0,9,0,12050,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,27354,60944,18,8,0,12244,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,27354,60944,18,9,0,12244,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28161,39996,0,8,0,12532,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28161,39996,0,8,0,12702,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28161,39996,0,9,0,12532,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28161,39996,0,9,0,12702,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28161,51037,0,8,0,12532,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28161,51037,0,8,0,12702,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28161,51037,0,9,0,12532,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28161,51037,0,9,0,12702,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28161,51961,0,8,0,12532,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28161,51961,0,8,0,12702,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28161,51961,0,9,0,12532,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28161,51961,0,9,0,12702,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28162,39996,0,8,0,12519,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28162,39996,0,9,0,12519,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28162,50737,0,8,0,12519,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28162,50737,0,9,0,12519,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28162,51026,0,8,0,12519,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28162,51026,0,9,0,12519,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28162,61286,0,8,0,12519,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28162,61286,0,9,0,12519,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28202,50926,0,8,0,12527,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28202,50926,0,9,0,12527,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28202,50927,0,8,0,12527,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28202,50927,0,9,0,12527,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28203,50918,0,8,0,12527,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28203,50918,0,9,0,12527,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28203,50919,0,8,0,12527,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28203,50919,0,9,0,12527,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28222,52082,0,8,0,12546,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28222,52082,0,9,0,12546,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28379,51658,0,8,0,12607,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28379,51658,0,9,0,12607,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28389,51592,0,8,0,12605,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28389,51592,0,9,0,12605,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28389,51593,0,8,0,12605,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28389,51593,0,9,0,12605,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,28782,52280,0,8,0,12687,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,28782,52280,0,9,0,12687,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,29488,54568,15,8,0,12670,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,29488,54568,15,9,0,12670,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,29563,56795,0,8,0,1,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,29598,54768,0,8,0,12856,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,29708,55028,0,8,0,12856,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,29708,55028,0,9,0,12856,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,29856,55363,0,8,0,12629,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,29856,55363,0,8,0,12643,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,29856,55363,0,9,0,12629,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,29856,55363,0,9,0,12643,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,29857,55457,0,8,0,12910,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,29857,55457,0,9,0,12910,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,30066,43977,0,8,0,12953,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,30337,43671,0,8,0,13069,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,30337,43671,0,9,0,13069,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,30500,56679,0,8,0,13045,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,30500,56679,0,9,0,13045,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,30560,57347,0,1,0,57348,0,0,1,'Forbidden aura for spellclick'),
|
||||||
|
(18,31736,59592,0,8,0,13280,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,31736,59592,0,9,0,13280,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,31785,59656,0,8,0,13283,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,31785,59656,0,9,0,13283,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,31883,60123,0,1,0,48085,0,0,1,'Forbidden aura for spellclick'),
|
||||||
|
(18,31893,60123,0,1,0,48084,0,0,1,'Forbidden aura for spellclick'),
|
||||||
|
(18,31894,60123,0,1,0,28276,0,0,1,'Forbidden aura for spellclick'),
|
||||||
|
(18,31895,60123,0,1,0,27874,0,0,1,'Forbidden aura for spellclick'),
|
||||||
|
(18,31896,60123,0,1,0,27873,0,0,1,'Forbidden aura for spellclick'),
|
||||||
|
(18,31897,60123,0,1,0,7001,0,0,1,'Forbidden aura for spellclick'),
|
||||||
|
(18,32788,57539,17,8,0,13075,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,32788,57539,17,9,0,13075,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,32790,57654,16,8,0,13073,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,32790,57654,16,9,0,13073,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,33498,63126,0,8,0,13654,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,33498,63126,0,9,0,13654,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,33790,62781,0,8,0,13690,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33790,62781,0,8,0,13705,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33791,62786,0,8,0,13696,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33791,62786,0,8,0,13711,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33792,62785,0,8,0,13694,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33792,62785,0,8,0,13709,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33793,62780,0,8,0,13688,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33793,62780,0,8,0,13704,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33794,62782,0,8,0,13689,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33794,62782,0,8,0,13706,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33795,62779,0,8,0,13685,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33795,62779,0,8,0,13703,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33796,62784,0,8,0,13693,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33796,62784,0,8,0,13708,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33798,62787,0,8,0,13695,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33798,62787,0,8,0,13710,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33799,62783,0,8,0,13691,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33799,62783,0,8,0,13707,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33800,62774,0,8,0,13593,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33800,62774,0,8,0,13684,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33842,63791,0,8,0,13668,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33842,63791,0,8,0,13687,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,33843,63792,0,8,0,13667,0,0,0,'Required quest rewarded for spellclick'),
|
||||||
|
(18,33843,63792,0,8,0,13686,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,33870,63663,0,8,0,1,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,34125,63215,0,8,0,13847,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,34125,63215,0,8,0,13851,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,34125,63215,0,8,0,13852,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,34125,63215,0,8,0,13854,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,34125,63215,0,8,0,13855,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,34125,63215,0,8,0,13856,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,34125,63215,0,8,0,13857,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,34125,63215,0,8,0,13858,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,34125,63215,0,8,0,13859,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,34125,63215,0,8,0,13860,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,34125,63215,0,8,0,13861,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,34125,63215,0,8,0,13862,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,34125,63215,0,8,0,13863,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,34125,63215,0,8,0,13864,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,34125,63215,0,9,0,13847,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,34125,63215,0,9,0,13851,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,34125,63215,0,9,0,13852,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,34125,63215,0,9,0,13854,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,34125,63215,0,9,0,13855,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,34125,63215,0,9,0,13856,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,34125,63215,0,9,0,13857,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,34125,63215,0,9,0,13858,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,34125,63215,0,9,0,13859,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,34125,63215,0,9,0,13860,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,34125,63215,0,9,0,13861,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,34125,63215,0,9,0,13862,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,34125,63215,0,9,0,13863,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,34125,63215,0,9,0,13864,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,38248,71462,0,1,0,71443,0,0,1,'Forbidden aura for spellclick'),
|
||||||
|
(18,40176,74904,0,8,0,25444,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,40176,74904,0,9,0,25444,0,0,0,'Required quest active for spellclick'),
|
||||||
|
(18,40176,74905,0,8,0,25444,0,0,1,'Forbidden rewarded quest for spellclick'),
|
||||||
|
(18,40176,74905,0,9,0,25444,0,0,0,'Required quest active for spellclick');
|
||||||
|
|
||||||
|
# Below is a procedure to dynamically convert custom content to conditions table.
|
||||||
|
# However this procedure only works for MySQL server versions >= 5.6 due to
|
||||||
|
# a bug / missing feature in older MySQL versions.
|
||||||
|
/*
|
||||||
|
|
||||||
|
DROP PROCEDURE IF EXISTS ConvertSpellClickConditions;
|
||||||
|
DELIMITER //
|
||||||
|
CREATE PROCEDURE ConvertSpellClickConditions()
|
||||||
|
BEGIN
|
||||||
|
DECLARE counter INT DEFAULT 0;
|
||||||
|
DECLARE recordCount INT DEFAULT 0;
|
||||||
|
DECLARE counterPlusOne INT DEFAULT 0;
|
||||||
|
DECLARE npcEntry INT DEFAULT 0;
|
||||||
|
DECLARE spellId INT DEFAULT 0;
|
||||||
|
DECLARE aura INT DEFAULT 0;
|
||||||
|
DECLARE quest INT DEFAULT 0;
|
||||||
|
DECLARE quest2 INT DEFAULT 0;
|
||||||
|
DECLARE questStartCanActive INT DEFAULT 0;
|
||||||
|
DECLARE maxElseGroupId INT DEFAULT 14; # Change this for custom content
|
||||||
|
SELECT COUNT(*) INTO recordCount FROM `npc_spellclick_spells` WHERE `aura_required` !=0;
|
||||||
|
WHILE counter < recordCount DO
|
||||||
|
SELECT `npc_entry`, `spell_id`, `aura_required`
|
||||||
|
INTO npcEntry, spellId, aura
|
||||||
|
FROM `npc_spellclick_spells` WHERE `aura_required` !=0
|
||||||
|
LIMIT counter,1;
|
||||||
|
INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,
|
||||||
|
`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`)
|
||||||
|
VALUES (18,npcEntry,spellId,1,0,aura,0,0,'Required aura for spellclick');
|
||||||
|
SET counter = counter+1;
|
||||||
|
END WHILE;
|
||||||
|
|
||||||
|
SET counter = 0;
|
||||||
|
SET recordCount = 0;
|
||||||
|
SELECT COUNT(*) INTO recordCount FROM `npc_spellclick_spells` WHERE `aura_forbidden` !=0;
|
||||||
|
WHILE counter < recordCount DO
|
||||||
|
SELECT `npc_entry`, `spell_id`, `aura_forbidden`
|
||||||
|
INTO npcEntry, spellId, aura
|
||||||
|
FROM `npc_spellclick_spells` WHERE `aura_forbidden` !=0
|
||||||
|
LIMIT counter,1;
|
||||||
|
INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,
|
||||||
|
`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`)
|
||||||
|
VALUES (18,npcEntry,spellId,1,0,aura,0,1,'Forbidden aura for spellclick');
|
||||||
|
SET counter = counter+1;
|
||||||
|
END WHILE;
|
||||||
|
|
||||||
|
SET counter = 0;
|
||||||
|
SET recordCount = 0;
|
||||||
|
SELECT COUNT(*) INTO recordCount FROM `npc_spellclick_spells` WHERE `quest_start` !=0;
|
||||||
|
WHILE counter < recordCount DO
|
||||||
|
SELECT `npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`
|
||||||
|
INTO npcEntry, spellId, quest, questStartCanActive, quest2
|
||||||
|
FROM `npc_spellclick_spells` WHERE `quest_start` !=0
|
||||||
|
LIMIT counter,1;
|
||||||
|
IF questStartCanActive = 1 AND quest2 = 0 THEN
|
||||||
|
INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`, `ConditionTypeOrReference`,
|
||||||
|
`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`)
|
||||||
|
VALUES (18,npcEntry,spellId,maxElseGroupId+1,9,0,quest,0,0,'Required quest active for spellclick');
|
||||||
|
INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`, `ConditionTypeOrReference`,
|
||||||
|
`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`)
|
||||||
|
VALUES (18,npcEntry,spellId,maxElseGroupId+1,8,0,quest,0,0,'Required quest rewarded for spellclick');
|
||||||
|
SET maxElseGroupId = maxElseGroupId+1;
|
||||||
|
# ELSE IF quest2 != 0 is handled in next loop (forbidden rewarded quest)
|
||||||
|
ELSEIF questStartCanActive = 1 && quest2 = quest THEN
|
||||||
|
INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,
|
||||||
|
`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`)
|
||||||
|
VALUES (18,npcEntry,spellId,9,0,quest,0,0,'Required quest active for spellclick');
|
||||||
|
# ^Adds the required active quest condition. Prohibit quest reward is done in next loop
|
||||||
|
ELSEIF questStartCanActive = 0 THEN
|
||||||
|
INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,
|
||||||
|
`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`)
|
||||||
|
VALUES (18,npcEntry,spellId,8,0,quest,0,0,'Required quest rewarded for spellclick');
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
SET counter = counter+1;
|
||||||
|
END WHILE;
|
||||||
|
|
||||||
|
SET counter = 0;
|
||||||
|
SET recordCount = 0;
|
||||||
|
SELECT COUNT(*) INTO recordCount FROM `npc_spellclick_spells` WHERE `quest_end` !=0;
|
||||||
|
WHILE counter < recordCount DO
|
||||||
|
SELECT `npc_entry`, `spell_id`, `quest_end`
|
||||||
|
INTO npcEntry, spellId, quest
|
||||||
|
FROM `npc_spellclick_spells` WHERE `quest_end` !=0
|
||||||
|
LIMIT counter,1;
|
||||||
|
INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,
|
||||||
|
`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`)
|
||||||
|
VALUES (18,npcEntry,spellId,8,0,quest,0,1,'Forbidden rewarded quest for spellclick');
|
||||||
|
SET counter = counter+1;
|
||||||
|
END WHILE;
|
||||||
|
|
||||||
|
END//
|
||||||
|
|
||||||
|
DELIMITER ;
|
||||||
|
|
||||||
|
CALL ConvertSpellClickConditions();
|
||||||
|
DROP PROCEDURE ConvertSpellClickConditions;
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
ALTER TABLE `npc_spellclick_spells`
|
||||||
|
DROP COLUMN `quest_start`,
|
||||||
|
DROP COLUMN `quest_start_active`,
|
||||||
|
DROP COLUMN `quest_end`,
|
||||||
|
DROP COLUMN `aura_required`,
|
||||||
|
DROP COLUMN `aura_forbidden`
|
||||||
|
;
|
||||||
@@ -299,6 +299,7 @@ uint32 Condition::GetMaxAvailableConditionTargets()
|
|||||||
case CONDITION_SOURCE_TYPE_SPELL:
|
case CONDITION_SOURCE_TYPE_SPELL:
|
||||||
case CONDITION_SOURCE_TYPE_CREATURE_TEMPLATE_VEHICLE:
|
case CONDITION_SOURCE_TYPE_CREATURE_TEMPLATE_VEHICLE:
|
||||||
case CONDITION_SOURCE_TYPE_VEHICLE_SPELL:
|
case CONDITION_SOURCE_TYPE_VEHICLE_SPELL:
|
||||||
|
case CONDITION_SOURCE_TYPE_SPELL_CLICK_EVENT:
|
||||||
case CONDITION_SOURCE_TYPE_GOSSIP_MENU:
|
case CONDITION_SOURCE_TYPE_GOSSIP_MENU:
|
||||||
case CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION:
|
case CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION:
|
||||||
case CONDITION_SOURCE_TYPE_SMART_EVENT:
|
case CONDITION_SOURCE_TYPE_SMART_EVENT:
|
||||||
@@ -409,17 +410,34 @@ ConditionList ConditionMgr::GetConditionsForNotGroupedEntry(ConditionSourceType
|
|||||||
return spellCond;
|
return spellCond;
|
||||||
}
|
}
|
||||||
|
|
||||||
ConditionList ConditionMgr::GetConditionsForVehicleSpell(uint32 creatureID, uint32 spellID)
|
|
||||||
|
ConditionList ConditionMgr::GetConditionsForSpellClickEvent(uint32 creatureId, uint32 spellId)
|
||||||
{
|
{
|
||||||
ConditionList cond;
|
ConditionList cond;
|
||||||
VehicleSpellConditionContainer::const_iterator itr = VehicleSpellConditionStore.find(creatureID);
|
CreatureSpellConditionContainer::const_iterator itr = SpellClickEventConditionStore.find(creatureId);
|
||||||
if (itr != VehicleSpellConditionStore.end())
|
if (itr != SpellClickEventConditionStore.end())
|
||||||
{
|
{
|
||||||
ConditionTypeContainer::const_iterator i = (*itr).second.find(spellID);
|
ConditionTypeContainer::const_iterator i = (*itr).second.find(spellId);
|
||||||
if (i != (*itr).second.end())
|
if (i != (*itr).second.end())
|
||||||
{
|
{
|
||||||
cond = (*i).second;
|
cond = (*i).second;
|
||||||
sLog->outDebug(LOG_FILTER_CONDITIONSYS, "GetConditionsForVehicleSpell: found conditions for Vehicle entry %u spell %u", creatureID, spellID);
|
sLog->outDebug(LOG_FILTER_CONDITIONSYS, "GetConditionsForSpellClickEvent: found conditions for Vehicle entry %u spell %u", creatureId, spellId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return cond;
|
||||||
|
}
|
||||||
|
|
||||||
|
ConditionList ConditionMgr::GetConditionsForVehicleSpell(uint32 creatureId, uint32 spellId)
|
||||||
|
{
|
||||||
|
ConditionList cond;
|
||||||
|
CreatureSpellConditionContainer::const_iterator itr = VehicleSpellConditionStore.find(creatureId);
|
||||||
|
if (itr != VehicleSpellConditionStore.end())
|
||||||
|
{
|
||||||
|
ConditionTypeContainer::const_iterator i = (*itr).second.find(spellId);
|
||||||
|
if (i != (*itr).second.end())
|
||||||
|
{
|
||||||
|
cond = (*i).second;
|
||||||
|
sLog->outDebug(LOG_FILTER_CONDITIONSYS, "GetConditionsForVehicleSpell: found conditions for Vehicle entry %u spell %u", creatureId, spellId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return cond;
|
return cond;
|
||||||
@@ -1073,9 +1091,19 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case CONDITION_SOURCE_TYPE_UNUSED_18:
|
case CONDITION_SOURCE_TYPE_SPELL_CLICK_EVENT:
|
||||||
sLog->outErrorDb("Found SourceTypeOrReferenceId = CONDITION_SOURCE_TYPE_UNUSED_18 in `conditions` table - ignoring");
|
if (!sObjectMgr->GetCreatureTemplate(cond->SourceGroup))
|
||||||
return false;
|
{
|
||||||
|
sLog->outErrorDb("SourceEntry %u in `condition` table, does not exist in `creature_template`, ignoring.", cond->SourceGroup);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!sSpellMgr->GetSpellInfo(cond->SourceEntry))
|
||||||
|
{
|
||||||
|
sLog->outErrorDb("SourceEntry %u in `condition` table, does not exist in `spell.dbc`, ignoring.", cond->SourceEntry);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
break;
|
||||||
case CONDITION_SOURCE_TYPE_GOSSIP_MENU:
|
case CONDITION_SOURCE_TYPE_GOSSIP_MENU:
|
||||||
case CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION:
|
case CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION:
|
||||||
case CONDITION_SOURCE_TYPE_SMART_EVENT:
|
case CONDITION_SOURCE_TYPE_SMART_EVENT:
|
||||||
@@ -1110,7 +1138,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cond->ConditionValue2 > 2)
|
if (cond->ConditionValue2 > EFFECT_2)
|
||||||
{
|
{
|
||||||
sLog->outErrorDb("Aura condition has non existing effect index (%u) (must be 0..2), skipped", cond->ConditionValue2);
|
sLog->outErrorDb("Aura condition has non existing effect index (%u) (must be 0..2), skipped", cond->ConditionValue2);
|
||||||
return false;
|
return false;
|
||||||
@@ -1574,13 +1602,13 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
|
|||||||
sLog->outErrorDb("Found ConditionTypeOrReference = CONDITION_UNUSED_19 in `conditions` table - ignoring");
|
sLog->outErrorDb("Found ConditionTypeOrReference = CONDITION_UNUSED_19 in `conditions` table - ignoring");
|
||||||
return false;
|
return false;
|
||||||
case CONDITION_UNUSED_20:
|
case CONDITION_UNUSED_20:
|
||||||
sLog->outErrorDb("Found ConditionTypeOrReference = CONDITION_UNUSED_19 in `conditions` table - ignoring");
|
sLog->outErrorDb("Found ConditionTypeOrReference = CONDITION_UNUSED_20 in `conditions` table - ignoring");
|
||||||
return false;
|
return false;
|
||||||
case CONDITION_UNUSED_21:
|
case CONDITION_UNUSED_21:
|
||||||
sLog->outErrorDb("Found ConditionTypeOrReference = CONDITION_UNUSED_19 in `conditions` table - ignoring");
|
sLog->outErrorDb("Found ConditionTypeOrReference = CONDITION_UNUSED_21 in `conditions` table - ignoring");
|
||||||
return false;
|
return false;
|
||||||
case CONDITION_UNUSED_24:
|
case CONDITION_UNUSED_24:
|
||||||
sLog->outErrorDb("Found ConditionTypeOrReference = CONDITION_UNUSED_19 in `conditions` table - ignoring");
|
sLog->outErrorDb("Found ConditionTypeOrReference = CONDITION_UNUSED_24 in `conditions` table - ignoring");
|
||||||
return false;
|
return false;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
@@ -1612,7 +1640,7 @@ void ConditionMgr::Clean()
|
|||||||
|
|
||||||
ConditionStore.clear();
|
ConditionStore.clear();
|
||||||
|
|
||||||
for (VehicleSpellConditionContainer::iterator itr = VehicleSpellConditionStore.begin(); itr != VehicleSpellConditionStore.end(); ++itr)
|
for (CreatureSpellConditionContainer::iterator itr = VehicleSpellConditionStore.begin(); itr != VehicleSpellConditionStore.end(); ++itr)
|
||||||
{
|
{
|
||||||
for (ConditionTypeContainer::iterator it = itr->second.begin(); it != itr->second.end(); ++it)
|
for (ConditionTypeContainer::iterator it = itr->second.begin(); it != itr->second.end(); ++it)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ enum ConditionSourceType
|
|||||||
CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION = 15,
|
CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION = 15,
|
||||||
CONDITION_SOURCE_TYPE_CREATURE_TEMPLATE_VEHICLE = 16,
|
CONDITION_SOURCE_TYPE_CREATURE_TEMPLATE_VEHICLE = 16,
|
||||||
CONDITION_SOURCE_TYPE_SPELL = 17,
|
CONDITION_SOURCE_TYPE_SPELL = 17,
|
||||||
CONDITION_SOURCE_TYPE_UNUSED_18 = 18,
|
CONDITION_SOURCE_TYPE_SPELL_CLICK_EVENT = 18,
|
||||||
CONDITION_SOURCE_TYPE_QUEST_ACCEPT = 19,
|
CONDITION_SOURCE_TYPE_QUEST_ACCEPT = 19,
|
||||||
CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK = 20,
|
CONDITION_SOURCE_TYPE_QUEST_SHOW_MARK = 20,
|
||||||
CONDITION_SOURCE_TYPE_VEHICLE_SPELL = 21,
|
CONDITION_SOURCE_TYPE_VEHICLE_SPELL = 21,
|
||||||
@@ -167,7 +167,7 @@ struct Condition
|
|||||||
ConditionValue2 = 0;
|
ConditionValue2 = 0;
|
||||||
ConditionValue3 = 0;
|
ConditionValue3 = 0;
|
||||||
ReferenceId = 0;
|
ReferenceId = 0;
|
||||||
ErrorTextId = 0;
|
ErrorTextId = 0;
|
||||||
ScriptId = 0;
|
ScriptId = 0;
|
||||||
NegativeCondition = false;
|
NegativeCondition = false;
|
||||||
}
|
}
|
||||||
@@ -180,7 +180,7 @@ struct Condition
|
|||||||
typedef std::list<Condition*> ConditionList;
|
typedef std::list<Condition*> ConditionList;
|
||||||
typedef std::map<uint32, ConditionList> ConditionTypeContainer;
|
typedef std::map<uint32, ConditionList> ConditionTypeContainer;
|
||||||
typedef std::map<ConditionSourceType, ConditionTypeContainer> ConditionContainer;
|
typedef std::map<ConditionSourceType, ConditionTypeContainer> ConditionContainer;
|
||||||
typedef std::map<uint32, ConditionTypeContainer> VehicleSpellConditionContainer;
|
typedef std::map<uint32, ConditionTypeContainer> CreatureSpellConditionContainer;
|
||||||
typedef std::map<std::pair<int32, uint32 /*SAI source_type*/>, ConditionTypeContainer> SmartEventConditionContainer;
|
typedef std::map<std::pair<int32, uint32 /*SAI source_type*/>, ConditionTypeContainer> SmartEventConditionContainer;
|
||||||
|
|
||||||
typedef std::map<uint32, ConditionList> ConditionReferenceContainer;//only used for references
|
typedef std::map<uint32, ConditionList> ConditionReferenceContainer;//only used for references
|
||||||
@@ -202,8 +202,9 @@ class ConditionMgr
|
|||||||
bool IsObjectMeetToConditions(WorldObject* object1, WorldObject* object2, ConditionList const& conditions);
|
bool IsObjectMeetToConditions(WorldObject* object1, WorldObject* object2, ConditionList const& conditions);
|
||||||
bool IsObjectMeetToConditions(ConditionSourceInfo& sourceInfo, ConditionList const& conditions);
|
bool IsObjectMeetToConditions(ConditionSourceInfo& sourceInfo, ConditionList const& conditions);
|
||||||
ConditionList GetConditionsForNotGroupedEntry(ConditionSourceType sourceType, uint32 entry);
|
ConditionList GetConditionsForNotGroupedEntry(ConditionSourceType sourceType, uint32 entry);
|
||||||
|
ConditionList GetConditionsForSpellClickEvent(uint32 creatureId, uint32 spellId);
|
||||||
ConditionList GetConditionsForSmartEvent(int32 entryOrGuid, uint32 eventId, uint32 sourceType);
|
ConditionList GetConditionsForSmartEvent(int32 entryOrGuid, uint32 eventId, uint32 sourceType);
|
||||||
ConditionList GetConditionsForVehicleSpell(uint32 creatureID, uint32 spellID);
|
ConditionList GetConditionsForVehicleSpell(uint32 creatureId, uint32 spellId);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool isSourceTypeValid(Condition* cond);
|
bool isSourceTypeValid(Condition* cond);
|
||||||
@@ -228,6 +229,7 @@ class ConditionMgr
|
|||||||
sourceType == CONDITION_SOURCE_TYPE_SPELL_LOOT_TEMPLATE ||
|
sourceType == CONDITION_SOURCE_TYPE_SPELL_LOOT_TEMPLATE ||
|
||||||
sourceType == CONDITION_SOURCE_TYPE_GOSSIP_MENU ||
|
sourceType == CONDITION_SOURCE_TYPE_GOSSIP_MENU ||
|
||||||
sourceType == CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION ||
|
sourceType == CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION ||
|
||||||
|
sourceType == CONDITION_SOURCE_TYPE_SPELL_CLICK_EVENT ||
|
||||||
sourceType == CONDITION_SOURCE_TYPE_VEHICLE_SPELL ||
|
sourceType == CONDITION_SOURCE_TYPE_VEHICLE_SPELL ||
|
||||||
sourceType == CONDITION_SOURCE_TYPE_SMART_EVENT);
|
sourceType == CONDITION_SOURCE_TYPE_SMART_EVENT);
|
||||||
}
|
}
|
||||||
@@ -237,7 +239,8 @@ class ConditionMgr
|
|||||||
|
|
||||||
ConditionContainer ConditionStore;
|
ConditionContainer ConditionStore;
|
||||||
ConditionReferenceContainer ConditionReferenceStore;
|
ConditionReferenceContainer ConditionReferenceStore;
|
||||||
VehicleSpellConditionContainer VehicleSpellConditionStore;
|
CreatureSpellConditionContainer VehicleSpellConditionStore;
|
||||||
|
CreatureSpellConditionContainer SpellClickEventConditionStore;
|
||||||
SmartEventConditionContainer SmartEventConditionStore;
|
SmartEventConditionContainer SmartEventConditionStore;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -22365,7 +22365,16 @@ void Player::UpdateForQuestWorldObjects()
|
|||||||
|
|
||||||
SpellClickInfoMapBounds clickPair = sObjectMgr->GetSpellClickInfoMapBounds(obj->GetEntry());
|
SpellClickInfoMapBounds clickPair = sObjectMgr->GetSpellClickInfoMapBounds(obj->GetEntry());
|
||||||
for (SpellClickInfoContainer::const_iterator _itr = clickPair.first; _itr != clickPair.second; ++_itr)
|
for (SpellClickInfoContainer::const_iterator _itr = clickPair.first; _itr != clickPair.second; ++_itr)
|
||||||
if (_itr->second.questStart || _itr->second.questEnd)
|
{
|
||||||
|
//! This code doesn't look right, but it was logically converted to condition system to do the exact
|
||||||
|
//! same thing it did before. It definitely needs to be overlooked for intended functionality.
|
||||||
|
ConditionList conds = sConditionMgr->GetConditionsForSpellClickEvent(obj->GetEntry(), _itr->second.spellId);
|
||||||
|
bool buildUpdateBlock = false;
|
||||||
|
for (ConditionList::const_iterator jtr = conds.begin(); jtr != conds.end() && !buildUpdateBlock; ++jtr)
|
||||||
|
if ((*jtr)->ConditionType == CONDITION_QUESTREWARDED || (*jtr)->ConditionType == CONDITION_QUESTTAKEN)
|
||||||
|
buildUpdateBlock = true;
|
||||||
|
|
||||||
|
if (buildUpdateBlock)
|
||||||
{
|
{
|
||||||
obj->BuildCreateUpdateBlockForPlayer(&udata, this);
|
obj->BuildCreateUpdateBlockForPlayer(&udata, this);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -55,6 +55,7 @@
|
|||||||
#include "SpellInfo.h"
|
#include "SpellInfo.h"
|
||||||
#include "MoveSplineInit.h"
|
#include "MoveSplineInit.h"
|
||||||
#include "MoveSpline.h"
|
#include "MoveSpline.h"
|
||||||
|
#include "ConditionMgr.h"
|
||||||
|
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
@@ -16870,57 +16871,61 @@ void Unit::JumpTo(WorldObject* obj, float speedZ)
|
|||||||
|
|
||||||
bool Unit::HandleSpellClick(Unit* clicker, int8 seatId)
|
bool Unit::HandleSpellClick(Unit* clicker, int8 seatId)
|
||||||
{
|
{
|
||||||
bool success = false;
|
|
||||||
uint32 spellClickEntry = GetVehicleKit() ? GetVehicleKit()->GetCreatureEntry() : GetEntry();
|
uint32 spellClickEntry = GetVehicleKit() ? GetVehicleKit()->GetCreatureEntry() : GetEntry();
|
||||||
SpellClickInfoMapBounds clickPair = sObjectMgr->GetSpellClickInfoMapBounds(spellClickEntry);
|
SpellClickInfoMapBounds clickPair = sObjectMgr->GetSpellClickInfoMapBounds(spellClickEntry);
|
||||||
for (SpellClickInfoContainer::const_iterator itr = clickPair.first; itr != clickPair.second; ++itr)
|
for (SpellClickInfoContainer::const_iterator itr = clickPair.first; itr != clickPair.second; ++itr)
|
||||||
{
|
{
|
||||||
if (itr->second.IsFitToRequirements(clicker, this))
|
//! First check simple relations from clicker to clickee
|
||||||
|
if (!itr->second.IsFitToRequirements(clicker, this))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
//! Check database conditions
|
||||||
|
ConditionList conds = sConditionMgr->GetConditionsForSpellClickEvent(spellClickEntry, itr->second.spellId);
|
||||||
|
ConditionSourceInfo info = ConditionSourceInfo(clicker, this);
|
||||||
|
if (!sConditionMgr->IsObjectMeetToConditions(info, conds))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
Unit* caster = (itr->second.castFlags & NPC_CLICK_CAST_CASTER_CLICKER) ? clicker : this;
|
||||||
|
Unit* target = (itr->second.castFlags & NPC_CLICK_CAST_TARGET_CLICKER) ? clicker : this;
|
||||||
|
uint64 origCasterGUID = (itr->second.castFlags & NPC_CLICK_CAST_ORIG_CASTER_OWNER) ? GetOwnerGUID() : clicker->GetGUID();
|
||||||
|
|
||||||
|
SpellInfo const* spellEntry = sSpellMgr->GetSpellInfo(itr->second.spellId);
|
||||||
|
// if (!spellEntry) should be checked at npc_spellclick load
|
||||||
|
|
||||||
|
if (seatId > -1)
|
||||||
{
|
{
|
||||||
Unit* caster = (itr->second.castFlags & NPC_CLICK_CAST_CASTER_CLICKER) ? clicker : this;
|
uint8 i = 0;
|
||||||
Unit* target = (itr->second.castFlags & NPC_CLICK_CAST_TARGET_CLICKER) ? clicker : this;
|
bool valid = false;
|
||||||
uint64 origCasterGUID = (itr->second.castFlags & NPC_CLICK_CAST_ORIG_CASTER_OWNER) ? GetOwnerGUID() : clicker->GetGUID();
|
while (i < MAX_SPELL_EFFECTS && !valid)
|
||||||
|
|
||||||
SpellInfo const* spellEntry = sSpellMgr->GetSpellInfo(itr->second.spellId);
|
|
||||||
// if (!spellEntry) should be checked at npc_spellclick load
|
|
||||||
|
|
||||||
if (seatId > -1)
|
|
||||||
{
|
{
|
||||||
uint8 i = 0;
|
if (spellEntry->Effects[i].ApplyAuraName == SPELL_AURA_CONTROL_VEHICLE)
|
||||||
bool valid = false;
|
|
||||||
while (i < MAX_SPELL_EFFECTS && !valid)
|
|
||||||
{
|
{
|
||||||
if (spellEntry->Effects[i].ApplyAuraName == SPELL_AURA_CONTROL_VEHICLE)
|
valid = true;
|
||||||
{
|
break;
|
||||||
valid = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
++i;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!valid)
|
|
||||||
{
|
|
||||||
sLog->outErrorDb("Spell %u specified in npc_spellclick_spells is not a valid vehicle enter aura!", itr->second.spellId);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (IsInMap(caster))
|
|
||||||
caster->CastCustomSpell(itr->second.spellId, SpellValueMod(SPELLVALUE_BASE_POINT0+i), seatId+1, target, true, NULL, NULL, origCasterGUID);
|
|
||||||
else // This can happen during Player::_LoadAuras
|
|
||||||
{
|
|
||||||
int32 bp0 = seatId;
|
|
||||||
Aura::TryRefreshStackOrCreate(spellEntry, MAX_EFFECT_MASK, this, clicker, &bp0, NULL, origCasterGUID);
|
|
||||||
}
|
}
|
||||||
|
++i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!valid)
|
||||||
|
{
|
||||||
|
sLog->outErrorDb("Spell %u specified in npc_spellclick_spells is not a valid vehicle enter aura!", itr->second.spellId);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (IsInMap(caster))
|
||||||
|
caster->CastCustomSpell(itr->second.spellId, SpellValueMod(SPELLVALUE_BASE_POINT0+i), seatId+1, target, true, NULL, NULL, origCasterGUID);
|
||||||
|
else // This can happen during Player::_LoadAuras
|
||||||
|
{
|
||||||
|
int32 bp0 = seatId;
|
||||||
|
Aura::TryRefreshStackOrCreate(spellEntry, MAX_EFFECT_MASK, this, clicker, &bp0, NULL, origCasterGUID);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (IsInMap(caster))
|
||||||
|
caster->CastSpell(target, spellEntry, true, NULL, NULL, origCasterGUID);
|
||||||
else
|
else
|
||||||
{
|
Aura::TryRefreshStackOrCreate(spellEntry, MAX_EFFECT_MASK, this, clicker, NULL, NULL, origCasterGUID);
|
||||||
if (IsInMap(caster))
|
|
||||||
caster->CastSpell(target, spellEntry, true, NULL, NULL, origCasterGUID);
|
|
||||||
else
|
|
||||||
Aura::TryRefreshStackOrCreate(spellEntry, MAX_EFFECT_MASK, this, clicker, NULL, NULL, origCasterGUID);
|
|
||||||
}
|
|
||||||
|
|
||||||
success = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -16928,7 +16933,7 @@ bool Unit::HandleSpellClick(Unit* clicker, int8 seatId)
|
|||||||
if (creature && creature->IsAIEnabled)
|
if (creature && creature->IsAIEnabled)
|
||||||
creature->AI()->DoAction(EVENT_SPELLCLICK);
|
creature->AI()->DoAction(EVENT_SPELLCLICK);
|
||||||
|
|
||||||
return success;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Unit::EnterVehicle(Unit* base, int8 seatId)
|
void Unit::EnterVehicle(Unit* base, int8 seatId)
|
||||||
|
|||||||
@@ -194,30 +194,8 @@ LanguageDesc const* GetLanguageDescByID(uint32 lang)
|
|||||||
bool SpellClickInfo::IsFitToRequirements(Unit const* clicker, Unit const* clickee) const
|
bool SpellClickInfo::IsFitToRequirements(Unit const* clicker, Unit const* clickee) const
|
||||||
{
|
{
|
||||||
Player const* playerClicker = clicker->ToPlayer();
|
Player const* playerClicker = clicker->ToPlayer();
|
||||||
if (playerClicker)
|
if (!playerClicker)
|
||||||
{
|
return true;
|
||||||
if (questStart)
|
|
||||||
{
|
|
||||||
// not in expected required quest state
|
|
||||||
if ((!questStartCanActive || !playerClicker->IsActiveQuest(questStart)) && !playerClicker->GetQuestRewardStatus(questStart))
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (questEnd)
|
|
||||||
{
|
|
||||||
// not in expected forbidden quest state
|
|
||||||
if (playerClicker->GetQuestRewardStatus(questEnd))
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (auraRequired)
|
|
||||||
if (!clicker->HasAura(auraRequired))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if (auraForbidden)
|
|
||||||
if (clicker->HasAura(auraForbidden))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
Unit const* summoner = NULL;
|
Unit const* summoner = NULL;
|
||||||
// Check summoners for party
|
// Check summoners for party
|
||||||
@@ -226,9 +204,6 @@ bool SpellClickInfo::IsFitToRequirements(Unit const* clicker, Unit const* clicke
|
|||||||
if (!summoner)
|
if (!summoner)
|
||||||
summoner = clickee;
|
summoner = clickee;
|
||||||
|
|
||||||
if (!playerClicker)
|
|
||||||
return true;
|
|
||||||
|
|
||||||
// This only applies to players
|
// This only applies to players
|
||||||
switch (userType)
|
switch (userType)
|
||||||
{
|
{
|
||||||
@@ -7117,8 +7092,8 @@ void ObjectMgr::LoadNPCSpellClickSpells()
|
|||||||
uint32 oldMSTime = getMSTime();
|
uint32 oldMSTime = getMSTime();
|
||||||
|
|
||||||
_spellClickInfoStore.clear();
|
_spellClickInfoStore.clear();
|
||||||
// 0 1 2 3 4 5 6 7 8
|
// 0 1 2 3
|
||||||
QueryResult result = WorldDatabase.Query("SELECT npc_entry, spell_id, quest_start, quest_start_active, quest_end, cast_flags, aura_required, aura_forbidden, user_type FROM npc_spellclick_spells");
|
QueryResult result = WorldDatabase.Query("SELECT npc_entry, spell_id, cast_flags, user_type FROM npc_spellclick_spells");
|
||||||
|
|
||||||
if (!result)
|
if (!result)
|
||||||
{
|
{
|
||||||
@@ -7149,66 +7124,14 @@ void ObjectMgr::LoadNPCSpellClickSpells()
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32 auraRequired = fields[6].GetUInt32();
|
uint8 userType = fields[3].GetUInt8();
|
||||||
if (auraRequired)
|
|
||||||
{
|
|
||||||
SpellInfo const* aurReqInfo = sSpellMgr->GetSpellInfo(auraRequired);
|
|
||||||
if (!aurReqInfo)
|
|
||||||
{
|
|
||||||
sLog->outErrorDb("Table npc_spellclick_spells references unknown aura required %u. Skipping entry.", auraRequired);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
uint32 auraForbidden = fields[7].GetUInt32();
|
|
||||||
if (auraForbidden)
|
|
||||||
{
|
|
||||||
SpellInfo const* aurForInfo = sSpellMgr->GetSpellInfo(auraForbidden);
|
|
||||||
if (!aurForInfo)
|
|
||||||
{
|
|
||||||
sLog->outErrorDb("Table npc_spellclick_spells references unknown aura forbidden %u. Skipping entry.", auraForbidden);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
uint32 quest_start = fields[2].GetUInt32();
|
|
||||||
|
|
||||||
// quest might be 0 to enable spellclick independent of any quest
|
|
||||||
if (quest_start)
|
|
||||||
{
|
|
||||||
if (_questTemplates.find(quest_start) == _questTemplates.end())
|
|
||||||
{
|
|
||||||
sLog->outErrorDb("Table npc_spellclick_spells references unknown start quest %u. Skipping entry.", quest_start);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool quest_start_active = fields[3].GetBool();
|
|
||||||
|
|
||||||
uint32 quest_end = fields[4].GetUInt32();
|
|
||||||
// quest might be 0 to enable spellclick active infinity after start quest
|
|
||||||
if (quest_end)
|
|
||||||
{
|
|
||||||
if (_questTemplates.find(quest_end) == _questTemplates.end())
|
|
||||||
{
|
|
||||||
sLog->outErrorDb("Table npc_spellclick_spells references unknown end quest %u. Skipping entry.", quest_end);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8 userType = fields[8].GetUInt8();
|
|
||||||
if (userType >= SPELL_CLICK_USER_MAX)
|
if (userType >= SPELL_CLICK_USER_MAX)
|
||||||
sLog->outErrorDb("Table npc_spellclick_spells references unknown user type %u. Skipping entry.", uint32(userType));
|
sLog->outErrorDb("Table npc_spellclick_spells references unknown user type %u. Skipping entry.", uint32(userType));
|
||||||
|
|
||||||
uint8 castFlags = fields[5].GetUInt8();
|
uint8 castFlags = fields[2].GetUInt8();
|
||||||
SpellClickInfo info;
|
SpellClickInfo info;
|
||||||
info.spellId = spellid;
|
info.spellId = spellid;
|
||||||
info.questStart = quest_start;
|
|
||||||
info.questStartCanActive = quest_start_active;
|
|
||||||
info.questEnd = quest_end;
|
|
||||||
info.castFlags = castFlags;
|
info.castFlags = castFlags;
|
||||||
info.auraRequired = auraRequired;
|
|
||||||
info.auraForbidden = auraForbidden;
|
|
||||||
info.userType = SpellClickUserTypes(userType);
|
info.userType = SpellClickUserTypes(userType);
|
||||||
_spellClickInfoStore.insert(SpellClickInfoContainer::value_type(npc_entry, info));
|
_spellClickInfoStore.insert(SpellClickInfoContainer::value_type(npc_entry, info));
|
||||||
|
|
||||||
|
|||||||
@@ -337,12 +337,7 @@ std::string GetScriptCommandName(ScriptCommands command);
|
|||||||
struct SpellClickInfo
|
struct SpellClickInfo
|
||||||
{
|
{
|
||||||
uint32 spellId;
|
uint32 spellId;
|
||||||
uint32 questStart; // quest start (quest must be active or rewarded for spell apply)
|
|
||||||
uint32 questEnd; // quest end (quest must not be rewarded for spell apply)
|
|
||||||
bool questStartCanActive; // if true then quest start can be active (not only rewarded)
|
|
||||||
uint8 castFlags;
|
uint8 castFlags;
|
||||||
uint32 auraRequired;
|
|
||||||
uint32 auraForbidden;
|
|
||||||
SpellClickUserTypes userType;
|
SpellClickUserTypes userType;
|
||||||
|
|
||||||
// helpers
|
// helpers
|
||||||
|
|||||||
Reference in New Issue
Block a user