From db2718cccba60288d93d569a280079c21d82e95d Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 26 Jan 2014 23:39:02 +0100 Subject: DB/Creature: Fix Seeping Feral Essence By Fateswhisper closes #11517 --- sql/updates/world/2014_01_26_08_world_creature_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2014_01_26_08_world_creature_template.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_26_08_world_creature_template.sql b/sql/updates/world/2014_01_26_08_world_creature_template.sql new file mode 100644 index 00000000000..8adaaa07a50 --- /dev/null +++ b/sql/updates/world/2014_01_26_08_world_creature_template.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_template` SET `flags_extra`=130 WHERE `entry`=34174; -- cgit v1.2.3 From 6dc15294e214b12aa9e401b7c5c5b7876c76f9b1 Mon Sep 17 00:00:00 2001 From: joschiwald Date: Sun, 26 Jan 2014 23:56:53 +0100 Subject: Core/Spells: move paladins judgements to spellscripts --- .../2014_01_26_09_world_spell_script_names_335.sql | 5 ++ src/server/game/Spells/SpellEffects.cpp | 60 +------------------ src/server/scripts/Spells/spell_druid.cpp | 6 +- src/server/scripts/Spells/spell_holiday.cpp | 11 ++-- src/server/scripts/Spells/spell_paladin.cpp | 69 ++++++++++++++++++++++ src/server/scripts/Spells/spell_priest.cpp | 4 +- 6 files changed, 86 insertions(+), 69 deletions(-) create mode 100644 sql/updates/world/2014_01_26_09_world_spell_script_names_335.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_26_09_world_spell_script_names_335.sql b/sql/updates/world/2014_01_26_09_world_spell_script_names_335.sql new file mode 100644 index 00000000000..664ff0f8228 --- /dev/null +++ b/sql/updates/world/2014_01_26_09_world_spell_script_names_335.sql @@ -0,0 +1,5 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` IN (53407,20271,53408); +INSERT INTO `spell_script_names` (`spell_id` ,`ScriptName`) VALUES +(53407,'spell_pal_judgement_of_justice'), +(20271,'spell_pal_judgement_of_light'), +(53408,'spell_pal_judgement_of_wisdom'); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 1369d915773..b2b4690f893 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -4101,65 +4101,6 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) } break; } - case SPELLFAMILY_PALADIN: - { - // Judgement (seal trigger) - if (m_spellInfo->GetCategory() == SPELLCATEGORY_JUDGEMENT) - { - if (!unitTarget || !unitTarget->IsAlive()) - return; - uint32 spellId1 = 0; - uint32 spellId2 = 0; - - // Judgement self add switch - switch (m_spellInfo->Id) - { - case 53407: spellId1 = 20184; break; // Judgement of Justice - case 20271: // Judgement of Light - case 57774: spellId1 = 20185; break; // Judgement of Light - case 53408: spellId1 = 20186; break; // Judgement of Wisdom - default: - TC_LOG_ERROR("spells", "Unsupported Judgement (seal trigger) spell (Id: %u) in Spell::EffectScriptEffect", m_spellInfo->Id); - return; - } - // all seals have aura dummy in 2 effect - Unit::AuraApplicationMap & sealAuras = m_caster->GetAppliedAuras(); - for (Unit::AuraApplicationMap::iterator iter = sealAuras.begin(); iter != sealAuras.end();) - { - Aura* aura = iter->second->GetBase(); - if (aura->GetSpellInfo()->GetSpellSpecific() == SPELL_SPECIFIC_SEAL) - { - if (AuraEffect* aureff = aura->GetEffect(2)) - if (aureff->GetAuraType() == SPELL_AURA_DUMMY) - { - if (sSpellMgr->GetSpellInfo(aureff->GetAmount())) - spellId2 = aureff->GetAmount(); - break; - } - if (!spellId2) - { - switch (iter->first) - { - // Seal of light, Seal of wisdom, Seal of justice - case 20165: - case 20166: - case 20164: - spellId2 = 54158; - } - } - break; - } - else - ++iter; - } - if (spellId1) - m_caster->CastSpell(unitTarget, spellId1, true); - if (spellId2) - m_caster->CastSpell(unitTarget, spellId2, true); - return; - } - break; - } case SPELLFAMILY_DEATHKNIGHT: { // Pestilence @@ -5800,6 +5741,7 @@ void Spell::SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const* TempSummon* summon = map->SummonCreature(entry, pos, properties, duration, caster, m_spellInfo->Id); if (!summon) return; + if (summon->HasUnitTypeMask(UNIT_MASK_GUARDIAN)) ((Guardian*)summon)->InitStatsForLevel(level); diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 482228fb649..f33a409cf25 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -1022,7 +1022,7 @@ class spell_dru_wild_growth : public SpellScriptLoader bool Validate(SpellInfo const* spellInfo) OVERRIDE { - if (spellInfo->Effects[EFFECT_2].IsEffect() || !spellInfo->Effects[EFFECT_2].CalcValue()) + if (spellInfo->Effects[EFFECT_2].IsEffect() || spellInfo->Effects[EFFECT_2].CalcValue() <= 0) return false; return true; } @@ -1031,9 +1031,9 @@ class spell_dru_wild_growth : public SpellScriptLoader { targets.remove_if(RaidCheck(GetCaster())); - int32 const maxTargets = GetSpellInfo()->Effects[EFFECT_2].CalcValue(GetCaster()); + uint32 const maxTargets = uint32(GetSpellInfo()->Effects[EFFECT_2].CalcValue(GetCaster())); - if (targets.size() > uint32(maxTargets)) + if (targets.size() > maxTargets) { targets.sort(Trinity::HealthPctOrderPred()); targets.resize(maxTargets); diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp index 08aa19a4755..07d95aa63f5 100644 --- a/src/server/scripts/Spells/spell_holiday.cpp +++ b/src/server/scripts/Spells/spell_holiday.cpp @@ -290,7 +290,7 @@ enum PilgrimsBountyBuffFood class spell_pilgrims_bounty_buff_food : public SpellScriptLoader { private: - uint32 _triggeredSpellId; + uint32 const _triggeredSpellId; public: spell_pilgrims_bounty_buff_food(const char* name, uint32 triggeredSpellId) : SpellScriptLoader(name), _triggeredSpellId(triggeredSpellId) { } @@ -298,12 +298,12 @@ class spell_pilgrims_bounty_buff_food : public SpellScriptLoader { PrepareAuraScript(spell_pilgrims_bounty_buff_food_AuraScript) private: - uint32 _triggeredSpellId; + uint32 const _triggeredSpellId; public: spell_pilgrims_bounty_buff_food_AuraScript(uint32 triggeredSpellId) : AuraScript(), _triggeredSpellId(triggeredSpellId) { } - bool Load() + bool Load() OVERRIDE { _handled = false; return true; @@ -311,6 +311,7 @@ class spell_pilgrims_bounty_buff_food : public SpellScriptLoader void HandleTriggerSpell(AuraEffect const* /*aurEff*/) { + PreventDefaultAction(); if (_handled) return; @@ -318,7 +319,7 @@ class spell_pilgrims_bounty_buff_food : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), _triggeredSpellId, true); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_pilgrims_bounty_buff_food_AuraScript::HandleTriggerSpell, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } @@ -326,7 +327,7 @@ class spell_pilgrims_bounty_buff_food : public SpellScriptLoader bool _handled; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pilgrims_bounty_buff_food_AuraScript(_triggeredSpellId); } diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index fa03e8fe5e6..b5265561d85 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -57,6 +57,11 @@ enum PaladinSpells SPELL_PALADIN_ITEM_HEALING_TRANCE = 37706, + SPELL_PALADIN_JUDGEMENT_DAMAGE = 54158, + SPELL_PALADIN_JUDGEMENT_OF_JUSTICE = 20184, + SPELL_PALADIN_JUDGEMENT_OF_LIGHT = 20185, + SPELL_PALADIN_JUDGEMENT_OF_WISDOM = 20186, + SPELL_PALADIN_GLYPH_OF_SALVATION = 63225, SPELL_PALADIN_RIGHTEOUS_DEFENSE_TAUNT = 31790, @@ -923,6 +928,67 @@ class spell_pal_item_healing_discount : public SpellScriptLoader } }; +// 53407 - Judgement of Justice +// 20271 - Judgement of Light +// 53408 - Judgement of Wisdom +class spell_pal_judgement : public SpellScriptLoader +{ + public: + spell_pal_judgement(char const* scriptName, uint32 spellId) : SpellScriptLoader(scriptName), _spellId(spellId) { } + + class spell_pal_judgement_SpellScript : public SpellScript + { + PrepareSpellScript(spell_pal_judgement_SpellScript); + + public: + spell_pal_judgement_SpellScript(uint32 spellId) : SpellScript(), _spellId(spellId) { } + + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + { + if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_JUDGEMENT_DAMAGE) + || !sSpellMgr->GetSpellInfo(_spellId)) + return false; + return true; + } + + void HandleScriptEffect(SpellEffIndex /*effIndex*/) + { + uint32 spellId2 = SPELL_PALADIN_JUDGEMENT_DAMAGE; + + // some seals have SPELL_AURA_DUMMY in EFFECT_2 + Unit::AuraEffectList const& auras = GetCaster()->GetAuraEffectsByType(SPELL_AURA_DUMMY); + for (Unit::AuraEffectList::const_iterator i = auras.begin(); i != auras.end(); ++i) + { + if ((*i)->GetSpellInfo()->GetSpellSpecific() == SPELL_SPECIFIC_SEAL && (*i)->GetEffIndex() == EFFECT_2) + if (sSpellMgr->GetSpellInfo((*i)->GetAmount())) + { + spellId2 = (*i)->GetAmount(); + break; + } + } + + GetCaster()->CastSpell(GetHitUnit(), _spellId, true); + GetCaster()->CastSpell(GetHitUnit(), spellId2, true); + } + + void Register() OVERRIDE + { + OnEffectHitTarget += SpellEffectFn(spell_pal_judgement_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } + + private: + uint32 const _spellId; + }; + + SpellScript* GetSpellScript() const OVERRIDE + { + return new spell_pal_judgement_SpellScript(_spellId); + } + + private: + uint32 const _spellId; +}; + // 20425 - Judgement of Command class spell_pal_judgement_of_command : public SpellScriptLoader { @@ -1187,6 +1253,9 @@ void AddSC_paladin_spell_scripts() new spell_pal_improved_aura_effect("spell_pal_improved_devotion_aura_effect"); new spell_pal_improved_aura_effect("spell_pal_sanctified_retribution_effect"); new spell_pal_item_healing_discount(); + new spell_pal_judgement("spell_pal_judgement_of_justice", SPELL_PALADIN_JUDGEMENT_OF_JUSTICE); + new spell_pal_judgement("spell_pal_judgement_of_light", SPELL_PALADIN_JUDGEMENT_OF_LIGHT); + new spell_pal_judgement("spell_pal_judgement_of_wisdom", SPELL_PALADIN_JUDGEMENT_OF_WISDOM); new spell_pal_judgement_of_command(); new spell_pal_lay_on_hands(); new spell_pal_righteous_defense(); diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 377d012fea5..71e5dac28ec 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -57,7 +57,7 @@ enum PriestSpellIcons class PowerCheck { public: - explicit PowerCheck(Powers power) : _power(power) { } + explicit PowerCheck(Powers const power) : _power(power) { } bool operator()(WorldObject* obj) const { @@ -68,7 +68,7 @@ class PowerCheck } private: - Powers _power; + Powers const _power; }; class RaidCheck -- cgit v1.2.3 From 56a04c78f9b2fb1d25014808f8f501bff75cdf9b Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jan 2014 05:47:58 +0100 Subject: DB/Quest: Seek the Farstriders By MrSmite, closes #11244 --- sql/updates/world/2014_01_27_00_creature_queststarter.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2014_01_27_00_creature_queststarter.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_27_00_creature_queststarter.sql b/sql/updates/world/2014_01_27_00_creature_queststarter.sql new file mode 100644 index 00000000000..d77ae243d5d --- /dev/null +++ b/sql/updates/world/2014_01_27_00_creature_queststarter.sql @@ -0,0 +1,2 @@ +-- +INSERT INTO `creature_queststarter` (`id`,`quest`) VALUES (16271,9617); -- cgit v1.2.3 From c536207c674ce1f143d5136c44830b1444d37f32 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jan 2014 05:54:42 +0100 Subject: DB/Creature: Delete incorrectly spawned Gharsul the Remorseless Closes #11242 --- sql/updates/world/2014_01_27_01_creature.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2014_01_27_01_creature.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_27_01_creature.sql b/sql/updates/world/2014_01_27_01_creature.sql new file mode 100644 index 00000000000..06383902c49 --- /dev/null +++ b/sql/updates/world/2014_01_27_01_creature.sql @@ -0,0 +1,2 @@ +-- +DELETE FROM `creature` WHERE `guid`=86933; -- cgit v1.2.3 From c38b9743ae09c0b71963d50a1823861af15e7546 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jan 2014 05:56:54 +0100 Subject: DB/Creature: Fix Shaman Elementals By Vincent-Michael, closes #11261 --- sql/updates/world/2014_01_27_02_creature_template.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2014_01_27_02_creature_template.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_27_02_creature_template.sql b/sql/updates/world/2014_01_27_02_creature_template.sql new file mode 100644 index 00000000000..3f8a5288f38 --- /dev/null +++ b/sql/updates/world/2014_01_27_02_creature_template.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_template` SET `spell1`=32982 WHERE `entry`=15439; +UPDATE `creature_template` SET `spell1`=33663 WHERE `entry`=15430; -- cgit v1.2.3 From 9d108dedd6fbe359cfb7c41a6e1080e0122fe8c3 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jan 2014 06:05:54 +0100 Subject: DB/Quest: Treats for Great-father Winter By dr-j, closes #11320 --- sql/updates/world/2014_01_27_03_world_quest.sql | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 sql/updates/world/2014_01_27_03_world_quest.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_27_03_world_quest.sql b/sql/updates/world/2014_01_27_03_world_quest.sql new file mode 100644 index 00000000000..b431d304bb2 --- /dev/null +++ b/sql/updates/world/2014_01_27_03_world_quest.sql @@ -0,0 +1,23 @@ +-- Fix taking of 6962/7025 Treats for Great-father Winter +-- Horde +UPDATE `quest_template` SET `PrevQuestId`=0 WHERE `Id`=6962; + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (19,20) and `SourceEntry`IN(6962); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(20, 0, 6962, 0, 0, 8, 0, 7021, 0, 0, 0, 0, 0, '', 'Treats for Great-father Winter once Great-father Winter is Here! Has been completed'), +(19, 0, 6962, 0, 0, 8, 0, 7021, 0, 0, 0, 0, 0, '', 'Treats for Great-father Winter once Great-father Winter is Here! Has been completed'), +(20, 0, 6962, 0, 1, 8, 0, 7024, 0, 0, 0, 0, 0, '', 'Treats for Great-father Winter once Great-father Winter is Here! Has been completed'), +(19, 0, 6962, 0, 1, 8, 0, 7024, 0, 0, 0, 0, 0, '', 'Treats for Great-father Winter once Great-father Winter is Here! Has been completed'), +(20, 0, 6962, 0, 2, 8, 0, 6961, 0, 0, 0, 0, 0, '', 'Treats for Great-father Winter once Great-father Winter is Here! Has been completed'), +(19, 0, 6962, 0, 2, 8, 0, 6961, 0, 0, 0, 0, 0, '', 'Treats for Great-father Winter once Great-father Winter is Here! Has been completed'); + +-- Alliance +UPDATE `quest_template` SET `PrevQuestId`=0 WHERE `Id`=7025; +UPDATE `creature_queststarter` SET `id`='13433' WHERE `id`='13429' and`quest`='7022'; + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (19,20) and `SourceEntry`IN(7025); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(20, 0, 7025, 0, 0, 8, 0, 7022, 0, 0, 0, 0, 0, '', 'Treats for Great-father Winter once Great-father Winter is Here! Has been completed'), +(19, 0, 7025, 0, 0, 8, 0, 7022, 0, 0, 0, 0, 0, '', 'Treats for Great-father Winter once Great-father Winter is Here! Has been completed'), +(20, 0, 7025, 0, 1, 8, 0, 7023, 0, 0, 0, 0, 0, '', 'Treats for Great-father Winter once Great-father Winter is Here! Has been completed'), +(19, 0, 7025, 0, 1, 8, 0, 7023, 0, 0, 0, 0, 0, '', 'Treats for Great-father Winter once Great-father Winter is Here! Has been completed'); -- cgit v1.2.3 From 6c140a079eeb480f4c22560bf7333121dc711012 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jan 2014 06:08:43 +0100 Subject: DB/Conditions: Requiere DK to use Scourge Gryphon By dr-j, closes #11133 --- sql/updates/world/2014_01_27_04_world_conditions.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2014_01_27_04_world_conditions.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_27_04_world_conditions.sql b/sql/updates/world/2014_01_27_04_world_conditions.sql new file mode 100644 index 00000000000..1ca0da434f3 --- /dev/null +++ b/sql/updates/world/2014_01_27_04_world_conditions.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceGroup`=29501 AND `SourceEntry`=54575; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(18, 29501, 54575, 0, 0, 15, 0, 32, 0, 0, 0, 0, 0, '', 'Spellclick only for dks'); -- cgit v1.2.3 From ec020ea048d67953ebc4e67d260d03c3c637d4c3 Mon Sep 17 00:00:00 2001 From: Vincent_Michael Date: Mon, 27 Jan 2014 06:26:48 +0100 Subject: SQL: Rename in correct name --- sql/updates/world/2014_01_27_00_creature_queststarter.sql | 2 -- sql/updates/world/2014_01_27_00_world_creature_queststarter.sql | 2 ++ sql/updates/world/2014_01_27_01_creature.sql | 2 -- sql/updates/world/2014_01_27_01_world_creature.sql | 2 ++ sql/updates/world/2014_01_27_02_creature_template.sql | 3 --- sql/updates/world/2014_01_27_02_world_creature_template.sql | 3 +++ 6 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 sql/updates/world/2014_01_27_00_creature_queststarter.sql create mode 100644 sql/updates/world/2014_01_27_00_world_creature_queststarter.sql delete mode 100644 sql/updates/world/2014_01_27_01_creature.sql create mode 100644 sql/updates/world/2014_01_27_01_world_creature.sql delete mode 100644 sql/updates/world/2014_01_27_02_creature_template.sql create mode 100644 sql/updates/world/2014_01_27_02_world_creature_template.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_27_00_creature_queststarter.sql b/sql/updates/world/2014_01_27_00_creature_queststarter.sql deleted file mode 100644 index d77ae243d5d..00000000000 --- a/sql/updates/world/2014_01_27_00_creature_queststarter.sql +++ /dev/null @@ -1,2 +0,0 @@ --- -INSERT INTO `creature_queststarter` (`id`,`quest`) VALUES (16271,9617); diff --git a/sql/updates/world/2014_01_27_00_world_creature_queststarter.sql b/sql/updates/world/2014_01_27_00_world_creature_queststarter.sql new file mode 100644 index 00000000000..d77ae243d5d --- /dev/null +++ b/sql/updates/world/2014_01_27_00_world_creature_queststarter.sql @@ -0,0 +1,2 @@ +-- +INSERT INTO `creature_queststarter` (`id`,`quest`) VALUES (16271,9617); diff --git a/sql/updates/world/2014_01_27_01_creature.sql b/sql/updates/world/2014_01_27_01_creature.sql deleted file mode 100644 index 06383902c49..00000000000 --- a/sql/updates/world/2014_01_27_01_creature.sql +++ /dev/null @@ -1,2 +0,0 @@ --- -DELETE FROM `creature` WHERE `guid`=86933; diff --git a/sql/updates/world/2014_01_27_01_world_creature.sql b/sql/updates/world/2014_01_27_01_world_creature.sql new file mode 100644 index 00000000000..06383902c49 --- /dev/null +++ b/sql/updates/world/2014_01_27_01_world_creature.sql @@ -0,0 +1,2 @@ +-- +DELETE FROM `creature` WHERE `guid`=86933; diff --git a/sql/updates/world/2014_01_27_02_creature_template.sql b/sql/updates/world/2014_01_27_02_creature_template.sql deleted file mode 100644 index 3f8a5288f38..00000000000 --- a/sql/updates/world/2014_01_27_02_creature_template.sql +++ /dev/null @@ -1,3 +0,0 @@ --- -UPDATE `creature_template` SET `spell1`=32982 WHERE `entry`=15439; -UPDATE `creature_template` SET `spell1`=33663 WHERE `entry`=15430; diff --git a/sql/updates/world/2014_01_27_02_world_creature_template.sql b/sql/updates/world/2014_01_27_02_world_creature_template.sql new file mode 100644 index 00000000000..3f8a5288f38 --- /dev/null +++ b/sql/updates/world/2014_01_27_02_world_creature_template.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_template` SET `spell1`=32982 WHERE `entry`=15439; +UPDATE `creature_template` SET `spell1`=33663 WHERE `entry`=15430; -- cgit v1.2.3 From 0b3ae6730d6164de0a6720d41ba34ad909ef4357 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jan 2014 07:48:17 +0100 Subject: DB/Misc: Fix Lunar Festival Invitation teleport coordinates By Vincent-Michael, updates #4945 --- sql/updates/world/2014_01_27_05_world_spell_target_position.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2014_01_27_05_world_spell_target_position.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_27_05_world_spell_target_position.sql b/sql/updates/world/2014_01_27_05_world_spell_target_position.sql new file mode 100644 index 00000000000..4dfb0ae26a4 --- /dev/null +++ b/sql/updates/world/2014_01_27_05_world_spell_target_position.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `spell_target_position` WHERE `id`=26448; +INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES +(26448,1,7581.01,-2225.35,473.64,1.80); -- cgit v1.2.3 From 22508d197fc708d560cd515fbe6ce521dece93e2 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jan 2014 08:26:18 +0100 Subject: DB/Gameobject: Spawn TEMP Greater Moonlight By Darkman1983, closes #4945 --- sql/updates/world/2014_01_27_06_world_gameobject.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 sql/updates/world/2014_01_27_06_world_gameobject.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_27_06_world_gameobject.sql b/sql/updates/world/2014_01_27_06_world_gameobject.sql new file mode 100644 index 00000000000..80b613e7603 --- /dev/null +++ b/sql/updates/world/2014_01_27_06_world_gameobject.sql @@ -0,0 +1,17 @@ +-- By Darkman1983 +SET @GUID =11995; +INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES +(@GUID+0, 300058, 1, 0, 0, 1983.464966, -4255.527344, 31.897110, 0.526572, 0, 0, 0, 0, 300, 0, 1), +(@GUID+1, 300058, 1, 0, 0, -1031.407349, -230.353455, 160.180954, 3.209599, 0, 0, 0, 0, 300, 0, 1), +(@GUID+2, 300058, 1, 0, 0, 10150.500000, 2602.330078, 1330.829956, 4.751910, 0, 0, 0, 0, 300, 0, 1), +(@GUID+3, 300058, 0, 0, 0, 1642.353760, 239.186249, 62.591576, 5.267044, 0, 0, 0, 0, 300, 0, 1), +(@GUID+4, 300058, 0, 0, 0, -4663.466797, -955.900879, 500.377686, 5.617465, 0, 0, 0, 0, 300, 0, 1), +(@GUID+5, 300058, 0, 0, 0, -8747.168945, 1073.401367, 90.419289, 5.551456, 0, 0, 0, 0, 300, 0, 1); + +INSERT INTO `game_event_gameobject` (`eventEntry`, `guid`) VALUES +(7, @GUID+0), +(7, @GUID+1), +(7, @GUID+2), +(7, @GUID+3), +(7, @GUID+4), +(7, @GUID+5); -- cgit v1.2.3 From c7310d2b1fa5fc0f6c654c88feb2d3b5863f0eb3 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jan 2014 08:47:25 +0100 Subject: DB/Creature: Fix some factions and levels Updates #11501 --- sql/updates/world/2014_01_27_07_world_creature_template.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2014_01_27_07_world_creature_template.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_27_07_world_creature_template.sql b/sql/updates/world/2014_01_27_07_world_creature_template.sql new file mode 100644 index 00000000000..6da1a479c5e --- /dev/null +++ b/sql/updates/world/2014_01_27_07_world_creature_template.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_template` SET `faction_A` = 83, `faction_H` = 83 WHERE `entry` = 38095; -- Sniffs confirm 37034 faction 83. +UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `faction_A`=83, `faction_H`=83 WHERE `entry`=35407; -- Sniffs confirm 34918 faction 83, copy level from normal mode. -- cgit v1.2.3 From c97d69ef61340f20e3c63b1face8ac110ff326a3 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jan 2014 09:32:21 +0100 Subject: DB/Creature: Fix some factions Updates #11501 --- sql/updates/world/2014_01_27_08_world_creature_template.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sql/updates/world/2014_01_27_08_world_creature_template.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_27_08_world_creature_template.sql b/sql/updates/world/2014_01_27_08_world_creature_template.sql new file mode 100644 index 00000000000..d5818d2c979 --- /dev/null +++ b/sql/updates/world/2014_01_27_08_world_creature_template.sql @@ -0,0 +1,6 @@ +-- +UPDATE `creature_template` SET `faction_A` = 1770, `faction_H` = 1770 WHERE `entry` = 37809; -- Sniff shows faction 1770 for mob 37774 +UPDATE `creature_template` SET `faction_A` = 1214, `faction_H` = 1214 WHERE `entry` = 37296; -- Sniff shows faction 1214 for mob 14282 +UPDATE `creature_template` SET `faction_A` = 1594, `faction_H` = 1594 WHERE `entry` = 37240; -- Sniff shows faction 1594 for mob 14187 +UPDATE `creature_template` SET `faction_A` = 1334, `faction_H` = 1334 WHERE `entry` = 37416; -- Sniff shows faction 1334 for mob 11997 +UPDATE `creature_template` SET `faction_A` = 877, `faction_H` = 877 WHERE `entry` = 37370; -- Sniff shows faction 877 for mob 14185 -- cgit v1.2.3 From 2f103a77ef35ecce4c59b280014a2d9c2cf086fb Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jan 2014 09:47:36 +0100 Subject: DB/Misc: Fix startup error added on 22508d1 --- sql/updates/world/2014_01_27_09_world_gameobject.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2014_01_27_09_world_gameobject.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_27_09_world_gameobject.sql b/sql/updates/world/2014_01_27_09_world_gameobject.sql new file mode 100644 index 00000000000..0d4a56a1045 --- /dev/null +++ b/sql/updates/world/2014_01_27_09_world_gameobject.sql @@ -0,0 +1,2 @@ +-- +UPDATE `gameobject` SET `spawnMask` = 1, `phaseMask` = 1 WHERE `id` = 300058; -- cgit v1.2.3 From 95f49c60c045cccc159acd79a898ea5c06bdd8bd Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jan 2014 11:49:00 +0100 Subject: DB/Creature: Fix some factions Updates #11501 --- sql/updates/world/2014_01_27_10_world_creature_template.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sql/updates/world/2014_01_27_10_world_creature_template.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_27_10_world_creature_template.sql b/sql/updates/world/2014_01_27_10_world_creature_template.sql new file mode 100644 index 00000000000..6a47eb02805 --- /dev/null +++ b/sql/updates/world/2014_01_27_10_world_creature_template.sql @@ -0,0 +1,5 @@ +-- +UPDATE `creature_template` SET `faction_A` = 534, `faction_H` = 534 WHERE `entry` IN (37497,37603,37604); -- Sniff shows faction 534 for mobs 37496,37497 +UPDATE `creature_template` SET `faction_A` = 57, `faction_H` = 57 WHERE `entry` = 37281; -- Sniff shows faction 57 for mob 14188 +UPDATE `creature_template` SET `faction_A` = 21, `faction_H` = 21 WHERE `entry` = 37638; -- Sniff shows faction 21 for mob 36830 +UPDATE `creature_template` SET `faction_A` = 74, `faction_H` = 74 WHERE `entry` IN (19897,19899); -- Sniff shows faction 74 for mobs 18176, 18179 -- cgit v1.2.3 From 9d863e2651c835c7f1fbccea80972047ba05b47b Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jan 2014 13:47:25 +0100 Subject: DB/Creature Fix 2 models of mobs By alpharius, closes #11210 --- sql/updates/world/2014_01_27_10_world_creature_model_info.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2014_01_27_10_world_creature_model_info.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_27_10_world_creature_model_info.sql b/sql/updates/world/2014_01_27_10_world_creature_model_info.sql new file mode 100644 index 00000000000..adb94260fb9 --- /dev/null +++ b/sql/updates/world/2014_01_27_10_world_creature_model_info.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_model_info` SET `modelid_other_gender`=0 WHERE `modelid` IN (1812, 3441); -- cgit v1.2.3 From ffea6d0ab3143b70f9b8d5d3cd14ce14bad03503 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jan 2014 14:23:54 +0100 Subject: DB/Creature: Fix some factions Updates #11501 --- sql/updates/world/2014_01_27_12_world_creature_template.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2014_01_27_12_world_creature_template.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_27_12_world_creature_template.sql b/sql/updates/world/2014_01_27_12_world_creature_template.sql new file mode 100644 index 00000000000..7e88de7d20d --- /dev/null +++ b/sql/updates/world/2014_01_27_12_world_creature_template.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_template` SET `faction_A` = 1215, `faction_H` = 1215 WHERE `entry` IN (37486,37318,37373,37485,37399,37401,37479,37320,37305); +UPDATE `creature_template` SET `faction_A` = 1217, `faction_H` = 1217 WHERE `entry` IN (37480,37483,37484); -- cgit v1.2.3 From 0d5c10d60e998b8e1032ef50cee83bfd0fd3f0ec Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 27 Jan 2014 14:47:50 +0100 Subject: DB/Creature: Fix some factions Updates #11501 --- sql/updates/world/2014_01_27_13_world_creature_template.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2014_01_27_13_world_creature_template.sql (limited to 'sql') diff --git a/sql/updates/world/2014_01_27_13_world_creature_template.sql b/sql/updates/world/2014_01_27_13_world_creature_template.sql new file mode 100644 index 00000000000..e7e6edf8ed5 --- /dev/null +++ b/sql/updates/world/2014_01_27_13_world_creature_template.sql @@ -0,0 +1,3 @@ +-- +UPDATE `creature_template` SET `faction_A` = 1217, `faction_H` = 1217 WHERE `entry` IN (37242,37349,37344,37427,37348,37420,37315); +UPDATE `creature_template` SET `faction_A` = 1534, `faction_H` = 1534 WHERE `entry` IN (37285,37287,37327); -- cgit v1.2.3