Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 10:05:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 4.3.4

Browse Source
This commit is contained in:
Nay
2012-08-29 14:01:38 +01:00
parent ee760ab360 856a5b62fb
commit aa9f2e9f18
4 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/updates/world/2012_08_28_00_world_spell_script_name.sql Normal file
View File

@@ -0,0 +1,4 @@
-- Spell script name linking for Defending Wyrmrest Temple: Destabilize Azure Dragonshrine Effect
DELETE FROM `spell_script_names` WHERE `spell_id`=49370 ;
INSERT INTO `spell_script_names` VALUES
(49370,'spell_q12372_destabilize_azure_dragonshrine_dummy');

6
sql/updates/world/2012_08_28_01_world_achievement_criteria_data.sql Normal file
View File

@@ -0,0 +1,6 @@
DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (11478,11479,12827,12828);
INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES
(11478, 12, 0, 0, ''), -- Koralon the Flame Watcher (10 player)
(11479, 12, 1, 0, ''), -- Koralon the Flame Watcher (25 player)
(12827, 12, 0, 0, ''), -- Toravon the Ice Watcher (10 player)
(12828, 12, 1, 0, ''); -- Toravon the Ice Watcher (25 player)

4
src/server/game/Battlefield/Zones/BattlefieldWG.h
View File

@@ -1209,7 +1209,7 @@ struct BfWGGameObjectBuilding
m_Build->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, NULL, true);
if (m_Build->GetEntry() == GO_WINTERGRASP_VAULT_GATE)
if (GameObject* go = m_Build->FindNearestGameObject(GO_WINTERGRASP_KEEP_COLLISION_WALL, 10.0f))
go->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, NULL, true);
go->EnableCollision(true);
// Update worldstate
m_State = BATTLEFIELD_WG_OBJECTSTATE_ALLIANCE_INTACT - (m_Team * 3);
@@ -1266,7 +1266,7 @@ struct BfWGGameObjectBuilding
break;
case BATTLEFIELD_WG_OBJECTTYPE_DOOR_LAST:
if (GameObject* go = m_Build->FindNearestGameObject(GO_WINTERGRASP_KEEP_COLLISION_WALL, 10.0f))
go->SetDestructibleState(GO_DESTRUCTIBLE_DESTROYED);
go->EnableCollision(false);
m_WG->SetRelicInteractible(true);
if (m_WG->GetRelic())
m_WG->GetRelic()->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);

39
src/server/scripts/Spells/spell_quest.cpp
View File

@@ -1276,6 +1276,44 @@ class spell_q12372_cast_from_gossip_trigger : public SpellScriptLoader
}
};
// http://www.wowhead.com/quest=12372 Defending Wyrmrest Temple
// 49370 - Wyrmrest Defender: Destabilize Azure Dragonshrine Effect
enum Quest12372Data
{
NPC_WYRMREST_TEMPLE_CREDIT = 27698,
};
class spell_q12372_destabilize_azure_dragonshrine_dummy : public SpellScriptLoader
{
public:
spell_q12372_destabilize_azure_dragonshrine_dummy() : SpellScriptLoader("spell_q12372_destabilize_azure_dragonshrine_dummy") { }
class spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript : public SpellScript
{
PrepareSpellScript(spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript);
void HandleDummy(SpellEffIndex /*effIndex*/)
{
if (GetHitCreature())
if (Unit* caster = GetOriginalCaster())
if (Vehicle* vehicle = caster->GetVehicleKit())
if (Unit* passenger = vehicle->GetPassenger(0))
if (Player* player = passenger->ToPlayer())
player->KilledMonsterCredit(NPC_WYRMREST_TEMPLE_CREDIT, 0);
}
void Register()
{
OnEffectHitTarget += SpellEffectFn(spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
SpellScript* GetSpellScript() const
{
return new spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript();
}
};
void AddSC_quest_spell_scripts()
{
new spell_q55_sacred_cleansing();
@@ -1306,4 +1344,5 @@ void AddSC_quest_spell_scripts()
new spell_q12066_bunny_kill_credit();
new spell_q12735_song_of_cleansing();
new spell_q12372_cast_from_gossip_trigger();
new spell_q12372_destabilize_azure_dragonshrine_dummy();
}