From 75eb6fc6081791975bf988b628bb819caf578cda Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Mon, 10 Sep 2012 02:54:28 +0200 Subject: DB/Game Event: Update Darkmoon Faire start times --- sql/updates/world/2012_09_10_00_world_game_event.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_09_10_00_world_game_event.sql (limited to 'sql') diff --git a/sql/updates/world/2012_09_10_00_world_game_event.sql b/sql/updates/world/2012_09_10_00_world_game_event.sql new file mode 100644 index 00000000000..edd6413379c --- /dev/null +++ b/sql/updates/world/2012_09_10_00_world_game_event.sql @@ -0,0 +1,3 @@ +UPDATE `game_event` SET `start_time`='2012-11-04 00:01:00' WHERE `eventEntry`=3; -- Darkmoon Faire - Terrokkar +UPDATE `game_event` SET `start_time`='2012-12-02 00:01:00' WHERE `eventEntry`=4; -- Darkmoon Faire - Elwynn +UPDATE `game_event` SET `start_time`='2012-10-07 00:01:00' WHERE `eventEntry`=5; -- Darkmoon Faire - Mulgore -- cgit v1.2.3 From 7790a2d6317139e60aaf589e24a73a25917342a7 Mon Sep 17 00:00:00 2001 From: nelegalno Date: Mon, 10 Sep 2012 03:19:28 +0200 Subject: DB/Quests: Fix "Homeward Bound" completion text Closes #7454 --- sql/updates/world/2012_09_10_01_world_quest_template.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2012_09_10_01_world_quest_template.sql (limited to 'sql') diff --git a/sql/updates/world/2012_09_10_01_world_quest_template.sql b/sql/updates/world/2012_09_10_01_world_quest_template.sql new file mode 100644 index 00000000000..2db8883d92c --- /dev/null +++ b/sql/updates/world/2012_09_10_01_world_quest_template.sql @@ -0,0 +1 @@ +UPDATE `quest_template` SET `OfferRewardText`="What!? If I knew that Pao'ka Swiftmountain was going to snoop around Highperch, I would have chained him to a totem! His father was reluctant allowing him to come with me to Thousand Needles. We came here to study the different creatures that inhabit these beautiful lands.$b$bI appreciate the help you have shown Pao'ka. I hope this covers any misfortunes this deed has cost you." WHERE `Id`=4770; -- cgit v1.2.3 From 0390f9d7085e143b740d6d0c438cf295378d33c4 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 10 Sep 2012 20:32:13 +0200 Subject: Scripts/Icecrown Citadel * Despawn Mutated Abomination when second phase transition ends, not begins * Prevent Unbound Plague jumping every 0.5 seconds to bypass the mechanic by raid members stacking in one place * Fixed Volatile Ooze not picking targets when everyone stood close to the tank * Fixed Ooze adds pickning new targets after old one gets lost Closes #7610 Closes #7611 Closes #7665 --- .../world/2012_09_10_02_world_creature_text.sql | 1 + src/server/game/Spells/SpellMgr.cpp | 3 + .../IcecrownCitadel/boss_professor_putricide.cpp | 183 +++++++++++---------- 3 files changed, 102 insertions(+), 85 deletions(-) create mode 100644 sql/updates/world/2012_09_10_02_world_creature_text.sql (limited to 'sql') diff --git a/sql/updates/world/2012_09_10_02_world_creature_text.sql b/sql/updates/world/2012_09_10_02_world_creature_text.sql new file mode 100644 index 00000000000..7a3b1a2d86f --- /dev/null +++ b/sql/updates/world/2012_09_10_02_world_creature_text.sql @@ -0,0 +1 @@ +UPDATE `creature_text` SET `text`='Good news, everyone! I think I''ve perfected a plague that will destroy all life on Azeroth!' WHERE `entry`=36678 AND `groupid`=4 AND `id`=0; diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index f718b118ad7..81807e63fb1 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3422,6 +3422,9 @@ void SpellMgr::LoadDbcDataCorrections() case 71159: // Awaken Plagued Zombies spellInfo->DurationIndex = 21; break; + case 70530: // Volatile Ooze Beam Protection (Professor Putricide) + spellInfo->Effect[0] = SPELL_EFFECT_APPLY_AURA; // for an unknown reason this was SPELL_EFFECT_APPLY_AREA_AURA_RAID + break; // THIS IS HERE BECAUSE COOLDOWN ON CREATURE PROCS IS NOT IMPLEMENTED case 71604: // Mutated Strength (Professor Putricide) case 72673: // Mutated Strength (Professor Putricide) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index a9ba0baa86f..04396275e0a 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -185,12 +185,15 @@ class AbominationDespawner if (Vehicle* veh = summon->GetVehicleKit()) veh->RemoveAllPassengers(); // also despawns the vehicle + // Found unit is Mutated Abomination, remove it return true; } + // Found unit is not Mutated Abomintaion, leave it return false; } + // No unit found, remove from SummonList return true; } @@ -198,6 +201,19 @@ class AbominationDespawner Unit* _owner; }; +struct RotfaceHeightCheck +{ + RotfaceHeightCheck(Creature* rotface) : _rotface(rotface) { } + + bool operator()(Creature* stalker) const + { + return stalker->GetPositionZ() < _rotface->GetPositionZ() + 5.0f; + } + +private: + Creature* _rotface; +}; + class boss_professor_putricide : public CreatureScript { public: @@ -246,7 +262,7 @@ class boss_professor_putricide : public CreatureScript events.Reset(); events.ScheduleEvent(EVENT_BERSERK, 600000); events.ScheduleEvent(EVENT_SLIME_PUDDLE, 10000); - events.ScheduleEvent(EVENT_UNSTABLE_EXPERIMENT, urand(25000, 30000)); + events.ScheduleEvent(EVENT_UNSTABLE_EXPERIMENT, urand(30000, 35000)); if (IsHeroic()) events.ScheduleEvent(EVENT_UNBOUND_PLAGUE, 20000); @@ -295,18 +311,16 @@ class boss_professor_putricide : public CreatureScript // no possible aura seen in sniff adding the aurastate summon->ModifyAuraState(AURA_STATE_UNKNOWN22, true); summon->CastSpell(summon, SPELL_GASEOUS_BLOAT_PROC, true); - summon->CastCustomSpell(SPELL_GASEOUS_BLOAT, SPELLVALUE_AURA_STACK, 10, summon, false); summon->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK, true); summon->SetReactState(REACT_PASSIVE); - return; + break; case NPC_VOLATILE_OOZE: // no possible aura seen in sniff adding the aurastate summon->ModifyAuraState(AURA_STATE_UNKNOWN19, true); summon->CastSpell(summon, SPELL_OOZE_ERUPTION_SEARCH_PERIODIC, true); - summon->CastSpell(summon, SPELL_VOLATILE_OOZE_ADHESIVE, false); summon->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK, true); summon->SetReactState(REACT_PASSIVE); - return; + break; case NPC_CHOKING_GAS_BOMB: summon->CastSpell(summon, SPELL_CHOKING_GAS_BOMB_PERIODIC, true); summon->CastSpell(summon, SPELL_CHOKING_GAS_EXPLOSION_TRIGGER, true); @@ -428,7 +442,8 @@ class boss_professor_putricide : public CreatureScript if (Creature* rotface = Unit::GetCreature(*me, instance->GetData64(DATA_ROTFACE))) { std::list list; - GetCreatureListWithEntryInGrid(list, rotface, NPC_PUDDLE_STALKER, 36.0f); + GetCreatureListWithEntryInGrid(list, rotface, NPC_PUDDLE_STALKER, 50.0f); + list.remove_if(RotfaceHeightCheck(rotface)); if (list.size() > 4) { list.sort(Trinity::ObjectDistanceOrderPred(rotface)); @@ -510,7 +525,6 @@ class boss_professor_putricide : public CreatureScript SetPhase(PHASE_COMBAT_3); events.ScheduleEvent(EVENT_MUTATED_PLAGUE, 25000); events.CancelEvent(EVENT_UNSTABLE_EXPERIMENT); - summons.remove_if(AbominationDespawner(me)); break; default: break; @@ -643,7 +657,7 @@ class boss_professor_putricide : public CreatureScript case EVENT_UNBOUND_PLAGUE: if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) { - me->CastCustomSpell(SPELL_UNBOUND_PLAGUE, SPELLVALUE_BASE_POINT0, 775, target); + DoCast(target, SPELL_UNBOUND_PLAGUE); DoCast(target, SPELL_UNBOUND_PLAGUE_SEARCHER); } events.ScheduleEvent(EVENT_UNBOUND_PLAGUE, 90000); @@ -668,6 +682,7 @@ class boss_professor_putricide : public CreatureScript me->SetFacingToObject(face); me->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL); Talk(SAY_TRANSFORM_2); + summons.remove_if(AbominationDespawner(me)); events.ScheduleEvent(EVENT_RESUME_ATTACK, 8500, 0, PHASE_COMBAT_3); break; default: @@ -702,57 +717,78 @@ class boss_professor_putricide : public CreatureScript } }; -class npc_volatile_ooze : public CreatureScript +class npc_putricide_oozeAI : public ScriptedAI { public: - npc_volatile_ooze() : CreatureScript("npc_volatile_ooze") { } + npc_putricide_oozeAI(Creature* creature, uint32 hitTargetSpellId) : ScriptedAI(creature), + _newTargetSelectTimer(0), _hitTargetSpellId(hitTargetSpellId) + { + } - struct npc_putricide_oozeAI : public ScriptedAI + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) { - npc_putricide_oozeAI(Creature* creature) : ScriptedAI(creature) - { - _newTargetSelectTimer = 0; - } + if (!_newTargetSelectTimer && spell->Id == sSpellMgr->GetSpellIdForDifficulty(_hitTargetSpellId, me)) + _newTargetSelectTimer = 1000; + } - void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) - { - if (!_newTargetSelectTimer && spell->Id == sSpellMgr->GetSpellIdForDifficulty(SPELL_OOZE_ERUPTION, me)) - _newTargetSelectTimer = 1000; - } + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + { + if (spell->Id == SPELL_TEAR_GAS_CREATURE) + _newTargetSelectTimer = 1000; + } + + void UpdateAI(uint32 const diff) + { + if (!UpdateVictim() && !_newTargetSelectTimer) + return; + + if (!_newTargetSelectTimer && !me->IsNonMeleeSpellCasted(false, false, true, false, true)) + _newTargetSelectTimer = 1000; + + DoMeleeAttackIfReady(); - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + if (!_newTargetSelectTimer) + return; + + if (me->HasAura(SPELL_TEAR_GAS_CREATURE)) + return; + + if (_newTargetSelectTimer <= diff) { - if (spell->Id == SPELL_TEAR_GAS_CREATURE) - _newTargetSelectTimer = 1000; + _newTargetSelectTimer = 0; + CastMainSpell(); } + else + _newTargetSelectTimer -= diff; + } - void UpdateAI(uint32 const diff) - { - if (!UpdateVictim() && !_newTargetSelectTimer) - return; + virtual void CastMainSpell() = 0; - if (!_newTargetSelectTimer) - return; + private: + uint32 _hitTargetSpellId; + uint32 _newTargetSelectTimer; +}; - if (me->HasAura(SPELL_TEAR_GAS_CREATURE)) - return; +class npc_volatile_ooze : public CreatureScript +{ + public: + npc_volatile_ooze() : CreatureScript("npc_volatile_ooze") { } - if (_newTargetSelectTimer <= diff) - { - _newTargetSelectTimer = 0; - me->CastSpell(me, SPELL_VOLATILE_OOZE_ADHESIVE, false); - } - else - _newTargetSelectTimer -= diff; + struct npc_volatile_oozeAI : public npc_putricide_oozeAI + { + npc_volatile_oozeAI(Creature* creature) : npc_putricide_oozeAI(creature, SPELL_OOZE_ERUPTION) + { } - private: - uint32 _newTargetSelectTimer; + void CastMainSpell() + { + me->CastSpell(me, SPELL_VOLATILE_OOZE_ADHESIVE, false); + } }; CreatureAI* GetAI(Creature* creature) const { - return GetIcecrownCitadelAI(creature); + return GetIcecrownCitadelAI(creature); } }; @@ -761,45 +797,16 @@ class npc_gas_cloud : public CreatureScript public: npc_gas_cloud() : CreatureScript("npc_gas_cloud") { } - struct npc_gas_cloudAI : public ScriptedAI + struct npc_gas_cloudAI : public npc_putricide_oozeAI { - npc_gas_cloudAI(Creature* creature) : ScriptedAI(creature) + npc_gas_cloudAI(Creature* creature) : npc_putricide_oozeAI(creature, SPELL_EXPUNGED_GAS) { _newTargetSelectTimer = 0; } - void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) - { - if (!_newTargetSelectTimer && spell->Id == sSpellMgr->GetSpellIdForDifficulty(SPELL_EXPUNGED_GAS, me)) - _newTargetSelectTimer = 1000; - } - - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void CastMainSpell() { - if (spell->Id == SPELL_TEAR_GAS_CREATURE) - _newTargetSelectTimer = 1000; - } - - void UpdateAI(uint32 const diff) - { - if (!UpdateVictim() && !_newTargetSelectTimer) - return; - - DoMeleeAttackIfReady(); - - if (!_newTargetSelectTimer) - return; - - if (me->HasAura(SPELL_TEAR_GAS_CREATURE)) - return; - - if (_newTargetSelectTimer <= diff) - { - _newTargetSelectTimer = 0; - me->CastCustomSpell(SPELL_GASEOUS_BLOAT, SPELLVALUE_AURA_STACK, 10, me, false); - } - else - _newTargetSelectTimer -= diff; + me->CastCustomSpell(SPELL_GASEOUS_BLOAT, SPELLVALUE_AURA_STACK, 10, me, false); } private: @@ -900,23 +907,12 @@ class spell_putricide_ooze_channel : public SpellScriptLoader GetCaster()->AddThreat(GetHitUnit(), 500000000.0f); // value seen in sniff } - // temporary, until SelectTarget are not called on empty lists - void CheckTarget() - { - if (_target) - return; - - FinishCast(SPELL_FAILED_NO_VALID_TARGETS); - GetCaster()->ToCreature()->DespawnOrUnsummon(1); // despawn next update - } - void Register() { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_ooze_channel_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_ooze_channel_SpellScript::SetTarget, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_ooze_channel_SpellScript::SetTarget, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); AfterHit += SpellHitFn(spell_putricide_ooze_channel_SpellScript::StartAttack); - OnCast += SpellCastFn(spell_putricide_ooze_channel_SpellScript::CheckTarget); } WorldObject* _target; @@ -1125,6 +1121,21 @@ class spell_putricide_unbound_plague : public SpellScriptLoader return true; } + SpellCastResult CheckCast() + { + if (AuraEffect const* eff = GetCaster()->GetAuraEffect(SPELL_UNBOUND_PLAGUE_SEARCHER, EFFECT_0)) + if (eff->GetTickNumber() < 2) + return SPELL_FAILED_DONT_REPORT; + + return SPELL_CAST_OK; + } + + void FilterTargets(std::list& targets) + { + targets.remove_if(Trinity::UnitAuraCheck(true, sSpellMgr->GetSpellIdForDifficulty(SPELL_UNBOUND_PLAGUE, GetCaster()))); + Trinity::Containers::RandomResizeList(targets, 1); + } + void HandleScript(SpellEffIndex /*effIndex*/) { if (!GetHitUnit()) @@ -1159,6 +1170,8 @@ class spell_putricide_unbound_plague : public SpellScriptLoader void Register() { + OnCheckCast += SpellCheckCastFn(spell_putricide_unbound_plague_SpellScript::CheckCast); + OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_unbound_plague_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); OnEffectHitTarget += SpellEffectFn(spell_putricide_unbound_plague_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; -- cgit v1.2.3 From 820a14ef31aff503d43ee7f11c69812417092a09 Mon Sep 17 00:00:00 2001 From: Trista Date: Tue, 11 Sep 2012 00:28:40 +0100 Subject: DB/Quests: Fix quest relations for Grark Lorkrub Closes #2659 --- sql/updates/world/2012_09_10_03_world_quest_template.sql.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2012_09_10_03_world_quest_template.sql.sql (limited to 'sql') diff --git a/sql/updates/world/2012_09_10_03_world_quest_template.sql.sql b/sql/updates/world/2012_09_10_03_world_quest_template.sql.sql new file mode 100644 index 00000000000..aae769ced71 --- /dev/null +++ b/sql/updates/world/2012_09_10_03_world_quest_template.sql.sql @@ -0,0 +1,3 @@ +-- Grark Lorkrub should be available only when Kill On Sight: High Ranking Dark Iron Officials is complete +UPDATE `quest_template` SET `NextQuestId`=4122 WHERE `Id`=4082; +UPDATE `quest_template` SET `PrevQuestId`=4082 WHERE `Id`=4122; -- cgit v1.2.3 From 282767450c663886fc8797600788b8e59d46fac0 Mon Sep 17 00:00:00 2001 From: Trista Date: Tue, 11 Sep 2012 00:30:09 +0100 Subject: DB/Quests: Fix quest relations for Disharmony of Flame Closes #2653 --- sql/updates/world/2012_09_10_03_world_quest_template.sql | 3 +++ sql/updates/world/2012_09_10_03_world_quest_template.sql.sql | 3 --- sql/updates/world/2012_09_10_04_world_quest_template.sql | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 sql/updates/world/2012_09_10_03_world_quest_template.sql delete mode 100644 sql/updates/world/2012_09_10_03_world_quest_template.sql.sql create mode 100644 sql/updates/world/2012_09_10_04_world_quest_template.sql (limited to 'sql') diff --git a/sql/updates/world/2012_09_10_03_world_quest_template.sql b/sql/updates/world/2012_09_10_03_world_quest_template.sql new file mode 100644 index 00000000000..aae769ced71 --- /dev/null +++ b/sql/updates/world/2012_09_10_03_world_quest_template.sql @@ -0,0 +1,3 @@ +-- Grark Lorkrub should be available only when Kill On Sight: High Ranking Dark Iron Officials is complete +UPDATE `quest_template` SET `NextQuestId`=4122 WHERE `Id`=4082; +UPDATE `quest_template` SET `PrevQuestId`=4082 WHERE `Id`=4122; diff --git a/sql/updates/world/2012_09_10_03_world_quest_template.sql.sql b/sql/updates/world/2012_09_10_03_world_quest_template.sql.sql deleted file mode 100644 index aae769ced71..00000000000 --- a/sql/updates/world/2012_09_10_03_world_quest_template.sql.sql +++ /dev/null @@ -1,3 +0,0 @@ --- Grark Lorkrub should be available only when Kill On Sight: High Ranking Dark Iron Officials is complete -UPDATE `quest_template` SET `NextQuestId`=4122 WHERE `Id`=4082; -UPDATE `quest_template` SET `PrevQuestId`=4082 WHERE `Id`=4122; diff --git a/sql/updates/world/2012_09_10_04_world_quest_template.sql b/sql/updates/world/2012_09_10_04_world_quest_template.sql new file mode 100644 index 00000000000..5805debd094 --- /dev/null +++ b/sql/updates/world/2012_09_10_04_world_quest_template.sql @@ -0,0 +1,2 @@ +-- Fix some quest requirements +UPDATE `quest_template` SET `PrevQuestId`=3906 WHERE `Id` IN (3907,7201); -- Disharmony of Fire and The Last Element are available only, if Disharmony of Flame is completed -- cgit v1.2.3 From 292cca744a441c4d109c83235b645a7fc3754e5f Mon Sep 17 00:00:00 2001 From: Aristoo Date: Tue, 11 Sep 2012 00:31:33 +0100 Subject: DB/NPCs: Little Ooze (Rotface in ICC) can not be taunted Closes #1993 --- sql/updates/world/2012_09_10_06_world_creature_template.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2012_09_10_06_world_creature_template.sql (limited to 'sql') diff --git a/sql/updates/world/2012_09_10_06_world_creature_template.sql b/sql/updates/world/2012_09_10_06_world_creature_template.sql new file mode 100644 index 00000000000..24a60b107ec --- /dev/null +++ b/sql/updates/world/2012_09_10_06_world_creature_template.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `flags_extra`=`flags_extra`|256 WHERE `entry` IN (36897, 38138); -- Little Ooze -- cgit v1.2.3 From 9f87270d80dd1d61db4b1e28f2af7d7dcec4a29d Mon Sep 17 00:00:00 2001 From: nelegalno Date: Tue, 11 Sep 2012 00:33:33 +0100 Subject: DB/Loot: Bump drop chance of Vic's Keys from 15% to 100% Closes #1954 --- sql/updates/world/2012_09_10_07_world_go_loot_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_09_10_07_world_go_loot_template.sql (limited to 'sql') diff --git a/sql/updates/world/2012_09_10_07_world_go_loot_template.sql b/sql/updates/world/2012_09_10_07_world_go_loot_template.sql new file mode 100644 index 00000000000..a5e30edfe2c --- /dev/null +++ b/sql/updates/world/2012_09_10_07_world_go_loot_template.sql @@ -0,0 +1,2 @@ +-- Vic's Keys drop chance ( http://old.wowhead.com/object=190778 ) by nelegalno +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance` = -100 WHERE `entry`=24861 AND `item`=39264; -- cgit v1.2.3 From f2067f98f90cfbe00e7dc30323c51ce3320ff509 Mon Sep 17 00:00:00 2001 From: Tomas Date: Tue, 11 Sep 2012 00:35:36 +0100 Subject: DB/Spells: Armistice aura is missing when player is in front Sunreaver Pavillion or Silver Covenant Pavillion Closes #1938 --- sql/updates/world/2012_09_10_08_world_spell_area.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/2012_09_10_08_world_spell_area.sql (limited to 'sql') diff --git a/sql/updates/world/2012_09_10_08_world_spell_area.sql b/sql/updates/world/2012_09_10_08_world_spell_area.sql new file mode 100644 index 00000000000..4e4e36051c9 --- /dev/null +++ b/sql/updates/world/2012_09_10_08_world_spell_area.sql @@ -0,0 +1,5 @@ +-- Cast Armistice in front of the pavillions as well +DELETE FROM `spell_area` WHERE `spell`=64373 AND `area` IN (4676, 4677); +INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_start_active`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`) VALUES +(64373,4676,0,0,0,0,0,2,1), -- Sunreaver Pavillion +(64373,4677,0,0,0,0,0,2,1); -- SIlver Covenant Pavillion -- cgit v1.2.3 From 73cdd187e26c5c281ebefe2fb9d77659314d4981 Mon Sep 17 00:00:00 2001 From: armano2 Date: Tue, 11 Sep 2012 00:40:00 +0100 Subject: DB/Quests: Creature involvedrelation for quest Words for Delivery Closes #1911 --- sql/updates/world/2012_09_10_09_world_creature_involvedrelation.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_09_10_09_world_creature_involvedrelation.sql (limited to 'sql') diff --git a/sql/updates/world/2012_09_10_09_world_creature_involvedrelation.sql b/sql/updates/world/2012_09_10_09_world_creature_involvedrelation.sql new file mode 100644 index 00000000000..e30e1559c54 --- /dev/null +++ b/sql/updates/world/2012_09_10_09_world_creature_involvedrelation.sql @@ -0,0 +1,4 @@ +DELETE FROM creature_involvedrelation WHERE quest IN (25500, 25286); +INSERT INTO creature_involvedrelation (id, quest) VALUES +(39675, 25500), +(39675, 25286); -- cgit v1.2.3 From 866bc4156d8d6c3b9244d632cf0ff03d851a84cc Mon Sep 17 00:00:00 2001 From: Kinzcool Date: Tue, 11 Sep 2012 00:42:12 +0100 Subject: DB/NPC: Various fix for gossip Closes #7156 --- sql/updates/world/2012_09_10_10_world_gossips.sql | 111 ++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 sql/updates/world/2012_09_10_10_world_gossips.sql (limited to 'sql') diff --git a/sql/updates/world/2012_09_10_10_world_gossips.sql b/sql/updates/world/2012_09_10_10_world_gossips.sql new file mode 100644 index 00000000000..d12b1a29bc5 --- /dev/null +++ b/sql/updates/world/2012_09_10_10_world_gossips.sql @@ -0,0 +1,111 @@ +-- gossip assignation from sniff +UPDATE `creature_template` SET `gossip_menu_id`=4534 WHERE `entry`=3047; -- Archmage Shymm +UPDATE `creature_template` SET `gossip_menu_id`=4536 WHERE `entry`=3048; -- Ursyn Ghull +UPDATE `creature_template` SET `gossip_menu_id`=12670 WHERE `entry`=6328; -- Dannie Fizzwizzle +UPDATE `creature_template` SET `gossip_menu_id`=12670 WHERE `entry`=6373; -- Dane Winslow +UPDATE `creature_template` SET `gossip_menu_id`=12670 WHERE `entry`=6374; -- Cylina Darkheart +UPDATE `creature_template` SET `gossip_menu_id`=1622 WHERE `entry`=8965; -- Shawn +UPDATE `creature_template` SET `gossip_menu_id`=4119 WHERE `entry`=11047; -- Kray +UPDATE `creature_template` SET `gossip_menu_id`=4266 WHERE `entry`=11051; -- Vhan +UPDATE `creature_template` SET `gossip_menu_id`=4154 WHERE `entry`=11065; -- Thonys Pillarstone +UPDATE `creature_template` SET `gossip_menu_id`=4158 WHERE `entry`=11071; -- Mot Dawnstrider +UPDATE `creature_template` SET `gossip_menu_id`=4204 WHERE `entry`=11081; -- Faldron +UPDATE `creature_template` SET `gossip_menu_id`=4181 WHERE `entry`=11083; -- Darianna +UPDATE `creature_template` SET `gossip_menu_id`=4207 WHERE `entry`=11084; -- Tarn +UPDATE `creature_template` SET `gossip_menu_id`=5142 WHERE `entry`=13442; -- Arch Druid Renferal +UPDATE `creature_template` SET `gossip_menu_id`=5141 WHERE `entry`=13443; -- Druid of the Grove +UPDATE `creature_template` SET `gossip_menu_id`=5081 WHERE `entry`=13447; -- Corporal Noreg Stormpike +UPDATE `creature_template` SET `gossip_menu_id`=5281 WHERE `entry`=13577; -- Stormpike Ram Rider Commander +UPDATE `creature_template` SET `gossip_menu_id`=7993 WHERE `entry`=15991; -- Lady Dena Kennedy +UPDATE `creature_template` SET `gossip_menu_id`=7471 WHERE `entry`=17421; -- Clopper Wizbang +UPDATE `creature_template` SET `gossip_menu_id`=7455 WHERE `entry`=17424; -- Anchorite Paetheus +UPDATE `creature_template` SET `gossip_menu_id`=7459 WHERE `entry`=17434; -- Morae +UPDATE `creature_template` SET `gossip_menu_id`=7461 WHERE `entry`=17599; -- Aonar +UPDATE `creature_template` SET `gossip_menu_id`=7462 WHERE `entry`=17649; -- Kessel +UPDATE `creature_template` SET `gossip_menu_id`=9821 WHERE `entry`=17666; -- Astur +UPDATE `creature_template` SET `gossip_menu_id`=7463 WHERE `entry`=17676; -- Achelus +UPDATE `creature_template` SET `gossip_menu_id`=7464 WHERE `entry`=17703; -- Messenger Hermesius +UPDATE `creature_template` SET `gossip_menu_id`=8298 WHERE `entry`=17712; -- Captain Edward Hanes +UPDATE `creature_template` SET `gossip_menu_id`=7835 WHERE `entry`=17927; -- Scout Jorli +UPDATE `creature_template` SET `gossip_menu_id`=7738 WHERE `entry`=18252; -- Andarl +UPDATE `creature_template` SET `gossip_menu_id`=7753 WHERE `entry`=18387; -- Bertelm +UPDATE `creature_template` SET `gossip_menu_id`=7743 WHERE `entry`=18389; -- Thander +UPDATE `creature_template` SET `gossip_menu_id`=7752 WHERE `entry`=18390; -- Ros'eleth +UPDATE `creature_template` SET `gossip_menu_id`=7695 WHERE `entry`=18416; -- Huntress Kima +UPDATE `creature_template` SET `gossip_menu_id`=7698 WHERE `entry`=18459; -- Jenai Starwhisper +UPDATE `creature_template` SET `gossip_menu_id`=7745 WHERE `entry`=18704; -- Taela Everstride +UPDATE `creature_template` SET `gossip_menu_id`=7773 WHERE `entry`=18713; -- Lieutenant Gravelhammer +UPDATE `creature_template` SET `gossip_menu_id`=7814 WHERE `entry`=18745; -- Captain Auric Sunchaser +UPDATE `creature_template` SET `gossip_menu_id`=7833 WHERE `entry`=18804; -- Prospector Nachlan +UPDATE `creature_template` SET `gossip_menu_id`=7940 WHERE `entry`=19137; -- "Shotgun" Jones +UPDATE `creature_template` SET `gossip_menu_id`=8433 WHERE `entry`=19340; -- Mi'irku Farstep +UPDATE `creature_template` SET `gossip_menu_id`=7973 WHERE `entry`=19375; -- Eli Thunderstrike +UPDATE `creature_template` SET `gossip_menu_id`=8251 WHERE `entry`=21151; -- Borgrim Stouthammer +UPDATE `creature_template` SET `gossip_menu_id`=8247 WHERE `entry`=21158; -- Commander Skyshadow +UPDATE `creature_template` SET `gossip_menu_id`=8252 WHERE `entry`=21197; -- Bronwyn Stouthammer +UPDATE `creature_template` SET `gossip_menu_id`=8566 WHERE `entry`=22832; -- Morthis Whisperwing + +-- gossip from sniff +DELETE FROM `gossip_menu` WHERE (`entry`=1621 AND `text_id`=2273) OR (`entry`=1622 AND `text_id`=2276) OR (`entry`=4119 AND `text_id`=5040) OR (`entry`=4154 AND `text_id`=5184) OR (`entry`=4158 AND `text_id`=5196) OR (`entry`=4181 AND `text_id`=5273) OR (`entry`=4204 AND `text_id`=5325) OR (`entry`=4207 AND `text_id`=5340) OR (`entry`=4266 AND `text_id`=5428) OR (`entry`=4534 AND `text_id`=563) OR (`entry`=4536 AND `text_id`=563) OR (`entry`=5081 AND `text_id`=6288) OR (`entry`=5141 AND `text_id`=6173) OR (`entry`=5142 AND `text_id`=6174) OR (`entry`=5281 AND `text_id`=6313) OR (`entry`=7455 AND `text_id`=9029) OR (`entry`=7459 AND `text_id`=9034) OR (`entry`=7461 AND `text_id`=9037) OR (`entry`=7462 AND `text_id`=9041) OR (`entry`=7463 AND `text_id`=9042) OR (`entry`=7464 AND `text_id`=9043) OR (`entry`=7471 AND `text_id`=9054) OR (`entry`=7695 AND `text_id`=9389) OR (`entry`=7698 AND `text_id`=9393) OR (`entry`=7738 AND `text_id`=9471) OR (`entry`=7743 AND `text_id`=9481) OR (`entry`=7745 AND `text_id`=9484) OR (`entry`=7752 AND `text_id`=9492) OR (`entry`=7753 AND `text_id`=9493) OR (`entry`=7773 AND `text_id`=9521) OR (`entry`=7814 AND `text_id`=9566) OR (`entry`=7833 AND `text_id`=9586) OR (`entry`=7835 AND `text_id`=9591) OR (`entry`=7940 AND `text_id`=9733) OR (`entry`=7973 AND `text_id`=9805) OR (`entry`=7993 AND `text_id`=9845) OR (`entry`=8247 AND `text_id`=10264) OR (`entry`=8251 AND `text_id`=10270) OR (`entry`=8252 AND `text_id`=10271) OR (`entry`=8298 AND `text_id`=10352) OR (`entry`=8432 AND `text_id`=10538) OR (`entry`=8433 AND `text_id`=10291) OR (`entry`=8433 AND `text_id`=10292) OR (`entry`=8566 AND `text_id`=10735); +INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES +(1621, 2273), -- 8962 +(1622, 2276), -- 8965 +(4119, 5040), -- 11047 +(4154, 5184), -- 11065 +(4158, 5196), -- 11071 +(4181, 5273), -- 11083 +(4204, 5325), -- 11081 +(4207, 5340), -- 11084 +(4266, 5428), -- 11051 +(4534, 563), -- 3047 +(4536, 563), -- 3048 +(5081, 6288), -- 13447 +(5141, 6173), -- 13443 +(5142, 6174), -- 13442 +(5281, 6313), -- 13577 +(7455, 9029), -- 17424 +(7459, 9034), -- 17434 +(7461, 9037), -- 17599 +(7462, 9041), -- 17649 +(7463, 9042), -- 17676 +(7464, 9043), -- 17703 +(7471, 9054), -- 17421 +(7695, 9389), -- 18416 +(7698, 9393), -- 18459 +(7738, 9471), -- 18252 +(7743, 9481), -- 18389 +(7745, 9484), -- 18704 +(7752, 9492), -- 18390 +(7753, 9493), -- 18387 +(7773, 9521), -- 18713 +(7814, 9566), -- 18745 +(7833, 9586), -- 18804 +(7835, 9591), -- 17927 +(7940, 9733), -- 19137 +(7973, 9805), -- 19375 +(7993, 9845), -- 15991 +(8247, 10264), -- 21158 +(8251, 10270), -- 21151 +(8252, 10271), -- 21197 +(8298, 10352), -- 17712 +(8432, 10538), -- 21983 +(8433, 10291), -- 19340 +(8433, 10292), -- 19340 +(8566, 10735); -- 22832 + +-- correct npc_flags for npc from sniff +UPDATE `creature_template` SET `npcflag`=0 WHERE `entry`=3210; -- Brave Proudsnout +UPDATE `creature_template` SET `npcflag`=0 WHERE `entry`=3211; -- Brave Lightninghorn +UPDATE `creature_template` SET `npcflag`=0 WHERE `entry`=3213; -- Brave Running Wolf +UPDATE `creature_template` SET `npcflag`=0 WHERE `entry`=3214; -- Brave Greathoof +UPDATE `creature_template` SET `npcflag`=0 WHERE `entry`=3502; -- Ratchet Bruiser +UPDATE `creature_template` SET `npcflag`=3 WHERE `entry`=21151; -- Borgrim Stouthammer +UPDATE `creature_template` SET `npcflag`=3 WHERE `entry`=21197; -- Bronwyn Stouthammer +UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=21469; -- Daranelle + +-- Add condition +DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId`=14 AND `SourceGroup`=8433 AND `SourceEntry`=10291) OR (`SourceTypeOrReferenceId`=14 AND `SourceGroup`=8433 AND `SourceEntry`=10292) OR (`SourceTypeOrReferenceId`=14 AND `SourceGroup`=12670 AND `SourceEntry`=12549); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(14,8433,10291,0,0,15,0,128,0,0,1,0,'','Show gossip text if player is not a mage'), +(14,8433,10292,0,0,15,0,128,0,0,0,0,'','Show gossip text if player is a mage'), +(14,12670,12549,0,0,15,0,256,0,1,0,0,'','Show gossip text if player is not a Warlock'); -- cgit v1.2.3 From f151ff7342e528655965942ce764c4c0603931c6 Mon Sep 17 00:00:00 2001 From: nelegalno Date: Tue, 11 Sep 2012 00:52:14 +0100 Subject: DB/Scripts: Fix quest Finding the Keymaster Ref #4661 Closes #2604 --- sql/updates/world/2012_09_10_10_world_gossips.sql | 2 +- sql/updates/world/2012_09_10_11_world_event_scripts.sql | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 sql/updates/world/2012_09_10_11_world_event_scripts.sql (limited to 'sql') diff --git a/sql/updates/world/2012_09_10_10_world_gossips.sql b/sql/updates/world/2012_09_10_10_world_gossips.sql index d12b1a29bc5..042b05dc83a 100644 --- a/sql/updates/world/2012_09_10_10_world_gossips.sql +++ b/sql/updates/world/2012_09_10_10_world_gossips.sql @@ -108,4 +108,4 @@ DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId`=14 AND `SourceGroup`=8 INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES (14,8433,10291,0,0,15,0,128,0,0,1,0,'','Show gossip text if player is not a mage'), (14,8433,10292,0,0,15,0,128,0,0,0,0,'','Show gossip text if player is a mage'), -(14,12670,12549,0,0,15,0,256,0,1,0,0,'','Show gossip text if player is not a Warlock'); +(14,12670,12549,0,0,15,0,256,0,0,1,0,'','Show gossip text if player is not a Warlock'); diff --git a/sql/updates/world/2012_09_10_11_world_event_scripts.sql b/sql/updates/world/2012_09_10_11_world_event_scripts.sql new file mode 100644 index 00000000000..e0b122ede05 --- /dev/null +++ b/sql/updates/world/2012_09_10_11_world_event_scripts.sql @@ -0,0 +1,7 @@ +-- Finding the Keymaster by nelegalno + +UPDATE `quest_template` SET `SpecialFlags` = 0, `RequiredSpellCast1` = 0 WHERE `ID` = 10256; +DELETE FROM `event_scripts` WHERE id=12857; +INSERT INTO `event_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES +(12857,0,10,19938,3000000,0,2248.43,2227.97,138.56,2.48121), +(12857,1,8,19938,1,0,0,0,0,0); -- cgit v1.2.3 From 8558a212118d440f68fba6884510a958f009943a Mon Sep 17 00:00:00 2001 From: Bizzy Date: Tue, 11 Sep 2012 00:59:47 +0100 Subject: DB/SAI: Fix npc Scrapped Fel Reaver Closes #3074 --- sql/updates/world/2012_09_10_12_world_sai.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_09_10_12_world_sai.sql (limited to 'sql') diff --git a/sql/updates/world/2012_09_10_12_world_sai.sql b/sql/updates/world/2012_09_10_12_world_sai.sql new file mode 100644 index 00000000000..99111fb5961 --- /dev/null +++ b/sql/updates/world/2012_09_10_12_world_sai.sql @@ -0,0 +1,4 @@ +UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry`=20243; +DELETE FROM `smart_scripts` WHERE `entryorguid`=20243 AND `id`=0 AND `source_type`=0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(20243,0,0,0,8,0,100,0,256,0,0,0,19,0,0,0,0,0,0,1,0,0,0,0.0,0.0,0.0,0.0,"Scrapped Fel Reaver - On Spellhit - Remove - OOC Not attackable - flags"); -- cgit v1.2.3 From 8d049545de87595a84e6e2c54d7b44b354644144 Mon Sep 17 00:00:00 2001 From: Kretol Date: Tue, 11 Sep 2012 01:01:57 +0100 Subject: DB/Creature: creature_model_info fix - Horde Guard Closes #3352 --- sql/updates/world/2012_09_10_13_world_creature_model_info.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2012_09_10_13_world_creature_model_info.sql (limited to 'sql') diff --git a/sql/updates/world/2012_09_10_13_world_creature_model_info.sql b/sql/updates/world/2012_09_10_13_world_creature_model_info.sql new file mode 100644 index 00000000000..339072d0502 --- /dev/null +++ b/sql/updates/world/2012_09_10_13_world_creature_model_info.sql @@ -0,0 +1,4 @@ +UPDATE `creature_model_info` SET `modelid_other_gender`=4264 WHERE `modelid`=4261; -- Female orc grunt +UPDATE `creature_model_info` SET `modelid_other_gender`=4263 WHERE `modelid`=4262; -- Female tauren +UPDATE `creature_model_info` SET `modelid_other_gender`=4262 WHERE `modelid`=4263; -- Male tauren +UPDATE `creature_model_info` SET `modelid_other_gender`=4261 WHERE `modelid`=4264; -- Male orc grunt -- cgit v1.2.3