josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source
This commit is contained in:
Vincent_Michael
2014-01-27 23:13:53 +01:00
parent 55c7cfaf4c 4567faa34b
commit a7c15e7368
7 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/world/2014_01_27_10_world_creature_model_info.sql → sql/updates/world/2014_01_27_11_world_creature_model_info.sql
View File
sql/updates/world/2014_01_27_14_world_creature_template.sql
+3
View File
@@ -0,0 +1,3 @@
--
UPDATE `creature_template` SET `faction_A` = 514, `faction_H` = 514 WHERE `entry` IN (13326,22714,32062,37383,37402,37404);
UPDATE `creature_template` SET `faction_A` = 1534, `faction_H` = 1534 WHERE `entry` IN (37407);
sql/updates/world/2014_01_27_15_world_creature_template.sql
+3
View File
@@ -0,0 +1,3 @@
--
UPDATE `creature_template` SET `faction_A` = 26, `faction_H` = 26 WHERE `entry` IN (37469,37470,37473);
UPDATE `creature_template` SET `faction_A` = 1214, `faction_H` = 1214 WHERE `entry` IN (13397,22745,32016);
sql/updates/world/2014_01_27_16_world_creature_template.sql
+3
View File
@@ -0,0 +1,3 @@
--
UPDATE `creature_template` SET `faction_A` = 59, `faction_H` = 59 WHERE `entry` IN (13099,22741,32012,37331,37340,37337,37366);
UPDATE `creature_template` SET `faction_A` = 39, `faction_H` = 39 WHERE `entry` IN (37475);
sql/updates/world/2014_01_27_17_world_creature_template.sql
+3
View File
@@ -0,0 +1,3 @@
--
UPDATE `creature_template` SET `faction_A` = 83, `faction_H` = 83 WHERE `entry` IN (35405,37323);
UPDATE `creature_template` SET `faction_A` = 1215, `faction_H` = 1215 WHERE `entry` IN (37481);
src/server/scripts/Spells/spell_druid.cpp
+11
View File
@@ -1197,12 +1197,23 @@ class spell_dru_wild_growth : public SpellScriptLoader
targets.sort(Trinity::HealthPctOrderPred());
targets.resize(maxTargets);
}
_targets = targets;
}
void SetTargets(std::list<WorldObject*>& targets)
{
targets = _targets;
}
void Register() OVERRIDE
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_wild_growth_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_wild_growth_SpellScript::SetTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY);
}
private:
std::list<WorldObject*> _targets;
};
SpellScript* GetSpellScript() const OVERRIDE
src/server/scripts/Spells/spell_paladin.cpp
-30
View File
@@ -876,35 +876,6 @@ class spell_pal_judgement : public SpellScriptLoader
}
};
// 20425 - Judgement of Command
class spell_pal_judgement_of_command : public SpellScriptLoader
{
public:
spell_pal_judgement_of_command() : SpellScriptLoader("spell_pal_judgement_of_command") { }
class spell_pal_judgement_of_command_SpellScript : public SpellScript
{
PrepareSpellScript(spell_pal_judgement_of_command_SpellScript);
void HandleDummy(SpellEffIndex /*effIndex*/)
{
if (Unit* unitTarget = GetHitUnit())
if (SpellInfo const* spell_proto = sSpellMgr->GetSpellInfo(GetEffectValue()))
GetCaster()->CastSpell(unitTarget, spell_proto, true, NULL);
}
void Register() OVERRIDE
{
OnEffectHitTarget += SpellEffectFn(spell_pal_judgement_of_command_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const OVERRIDE
{
return new spell_pal_judgement_of_command_SpellScript();
}
};
// 633 - Lay on Hands
class spell_pal_lay_on_hands : public SpellScriptLoader
{
@@ -1194,7 +1165,6 @@ void AddSC_paladin_spell_scripts()
new spell_pal_improved_aura_effect("spell_pal_sanctified_retribution_effect");
new spell_pal_item_healing_discount();
new spell_pal_judgement();
new spell_pal_judgement_of_command();
new spell_pal_lay_on_hands();
new spell_pal_righteous_defense();
new spell_pal_sacred_shield();