From c9a5aef06167813ba679c194183f003583f9ff3d Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 26 Jun 2011 01:12:16 +0200 Subject: Scripts/Icecrown Citadel * Fixed Mark of the Fallen Champion * Allow attacking Lady Deathwhisper during intro Closes #2088 --- sql/updates/world/2011_06_26_00_world_spell_script_names.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2011_06_26_00_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2011_06_26_00_world_spell_script_names.sql b/sql/updates/world/2011_06_26_00_world_spell_script_names.sql new file mode 100644 index 00000000000..0a7323b14bd --- /dev/null +++ b/sql/updates/world/2011_06_26_00_world_spell_script_names.sql @@ -0,0 +1 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_deathbringer_mark_of_the_fallen_champion'; -- cgit v1.2.3 From 6667277a165efaaa7115b33367ab0fb74d899ed8 Mon Sep 17 00:00:00 2001 From: click Date: Sun, 26 Jun 2011 10:35:35 +0200 Subject: Core/Commands: Remove deprecated command for modifying pet training points (.pet tp) - removed in patch 3.0.2 and replaced with talentpoints (command for adjusting that already exists). Closes #135. --- sql/updates/world/2011_06_26_01_world_command.sql | 1 + src/server/game/Chat/Chat.cpp | 1 - src/server/game/Chat/Chat.h | 1 - src/server/game/Chat/Commands/Level2.cpp | 23 ----------------------- 4 files changed, 1 insertion(+), 25 deletions(-) create mode 100644 sql/updates/world/2011_06_26_01_world_command.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2011_06_26_01_world_command.sql b/sql/updates/world/2011_06_26_01_world_command.sql new file mode 100644 index 00000000000..d5ac88cfc4c --- /dev/null +++ b/sql/updates/world/2011_06_26_01_world_command.sql @@ -0,0 +1 @@ +DELETE FROM `command` WHERE `name`='pet tp'; diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 6142f52855e..1e9a65500de 100755 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -206,7 +206,6 @@ ChatCommand * ChatHandler::getCommandTable() { "create", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandleCreatePetCommand>, "", NULL }, { "learn", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandlePetLearnCommand>, "", NULL }, { "unlearn", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandlePetUnlearnCommand>, "", NULL }, - { "tp", SEC_GAMEMASTER, false, OldHandler<&ChatHandler::HandlePetTpCommand>, "", NULL }, { NULL, 0, false, NULL, "", NULL } }; diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h index dd845c1c70d..257e7fec864 100755 --- a/src/server/game/Chat/Chat.h +++ b/src/server/game/Chat/Chat.h @@ -293,7 +293,6 @@ class ChatHandler bool HandleHideAreaCommand(const char* args); bool HandleAddItemCommand(const char* args); bool HandleAddItemSetCommand(const char* args); - bool HandlePetTpCommand(const char* args); bool HandlePetUnlearnCommand(const char* args); bool HandlePetLearnCommand(const char* args); bool HandleCreatePetCommand(const char* args); diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp index 93347163b92..e1b9b61e920 100755 --- a/src/server/game/Chat/Commands/Level2.cpp +++ b/src/server/game/Chat/Commands/Level2.cpp @@ -913,29 +913,6 @@ bool ChatHandler::HandlePetUnlearnCommand(const char *args) return true; } -bool ChatHandler::HandlePetTpCommand(const char *args) -{ - if (!*args) - return false; - - Player *plr = m_session->GetPlayer(); - Pet *pet = plr->GetPet(); - - if (!pet) - { - PSendSysMessage("You have no pet"); - SetSentErrorMessage(true); - return false; - } - - uint32 tp = atol(args); - - //pet->SetTP(tp); - - PSendSysMessage("Pet's tp changed to %u", tp); - return true; -} - bool ChatHandler::HandleLookupTitleCommand(const char* args) { if (!*args) -- cgit v1.2.3 From 2b1039d0e1e78e85a19185208e125b2a2473778c Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 26 Jun 2011 11:45:29 +0200 Subject: Scripts/Icecrown Citadel * Removed spellmgr hacks for Boiling Blood * Removed obsolete effect from Resistant Skin causing them to lose the aura when hit by shadow spell --- sql/scripts/world_scripts_full.sql | 4 +++ .../2011_06_26_02_world_spell_script_names.sql | 6 ++++ src/server/game/Spells/SpellMgr.cpp | 9 ++--- .../IcecrownCitadel/boss_deathbringer_saurfang.cpp | 42 ++++++++++++++++++++-- 4 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 sql/updates/world/2011_06_26_02_world_spell_script_names.sql (limited to 'sql/updates') diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql index 9bb8c5ef740..45c971dd970 100644 --- a/sql/scripts/world_scripts_full.sql +++ b/sql/scripts/world_scripts_full.sql @@ -2048,6 +2048,10 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES ( 72440, 'spell_deathbringer_blood_nova'), ( 72378, 'spell_deathbringer_blood_nova_targeting'), ( 73058, 'spell_deathbringer_blood_nova_targeting'), +( 72385, 'spell_deathbringer_boiling_blood'), +( 72441, 'spell_deathbringer_boiling_blood'), +( 72442, 'spell_deathbringer_boiling_blood'), +( 72443, 'spell_deathbringer_boiling_blood'), ( 72155, 'spell_icc_harvest_blight_specimen'), ( 72162, 'spell_icc_harvest_blight_specimen'), ( 71123, 'spell_stinky_precious_decimate'), diff --git a/sql/updates/world/2011_06_26_02_world_spell_script_names.sql b/sql/updates/world/2011_06_26_02_world_spell_script_names.sql new file mode 100644 index 00000000000..cde210b091c --- /dev/null +++ b/sql/updates/world/2011_06_26_02_world_spell_script_names.sql @@ -0,0 +1,6 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_deathbringer_boiling_blood'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(72385,'spell_deathbringer_boiling_blood'), +(72441,'spell_deathbringer_boiling_blood'), +(72442,'spell_deathbringer_boiling_blood'), +(72443,'spell_deathbringer_boiling_blood'); diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index d6a447bd75f..2ba9ca36528 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -4125,12 +4125,9 @@ void SpellMgr::LoadSpellCustomAttr() spellInfo->EffectRadiusIndex[0] = 12; // 100yd ++count; break; - case 72385: // Boiling Blood (Deathbringer Saurfang) - case 72441: // Boiling Blood (Deathbringer Saurfang) - case 72442: // Boiling Blood (Deathbringer Saurfang) - case 72443: // Boiling Blood (Deathbringer Saurfang) - spellInfo->EffectImplicitTargetA[0] = TARGET_UNIT_TARGET_ENEMY; - spellInfo->EffectImplicitTargetB[0] = 0; + case 72723: // Resistant Skin (Deathbringer Saurfang adds) + // this spell initially granted Shadow damage immunity, however it was removed but the data was left in client + spellInfo->Effect[2] = 0; ++count; break; case 70460: // Coldflame Jets (Traps after Saurfang) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 96bfb17e5d4..6fc60bdba09 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -450,7 +450,7 @@ class boss_deathbringer_saurfang : public CreatureScript // select at range only Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, -10.0f, true); if (!target) - target = SelectTarget(SELECT_TARGET_RANDOM, 1, 10.0f, true); // noone? select melee + target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true); // noone? select melee if (target) DoCast(target, SPELL_BLOOD_NOVA_TRIGGER); events.ScheduleEvent(EVENT_BLOOD_NOVA, urand(20000, 25000), 0, PHASE_COMBAT); @@ -461,8 +461,7 @@ class boss_deathbringer_saurfang : public CreatureScript events.ScheduleEvent(EVENT_RUNE_OF_BLOOD, urand(20000, 25000), 0, PHASE_COMBAT); break; case EVENT_BOILING_BLOOD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, -BOILING_BLOOD_HELPER)) - DoCast(target, SPELL_BOILING_BLOOD); + DoCast(me, SPELL_BOILING_BLOOD); events.ScheduleEvent(EVENT_BOILING_BLOOD, urand(15000, 20000), 0, PHASE_COMBAT); break; case EVENT_BERSERK: @@ -1222,6 +1221,42 @@ class spell_deathbringer_blood_nova_targeting : public SpellScriptLoader } }; +class spell_deathbringer_boiling_blood : public SpellScriptLoader +{ + public: + spell_deathbringer_boiling_blood() : SpellScriptLoader("spell_deathbringer_boiling_blood") { } + + class spell_deathbringer_boiling_blood_SpellScript : public SpellScript + { + PrepareSpellScript(spell_deathbringer_boiling_blood_SpellScript); + + bool Load() + { + return GetCaster()->GetTypeId() == TYPEID_UNIT; + } + + void FilterTargets(std::list& unitList) + { + unitList.remove(GetCaster()->getVictim()); + std::list::iterator itr = unitList.begin(); + std::advance(itr, urand(0, unitList.size() - 1)); + Unit* target = *itr; + unitList.clear(); + unitList.push_back(target); + } + + void Register() + { + OnUnitTargetSelect += SpellUnitTargetFn(spell_deathbringer_boiling_blood_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_AREA_ENEMY_SRC); + } + }; + + SpellScript* GetSpellScript() const + { + return new spell_deathbringer_boiling_blood_SpellScript(); + } +}; + class achievement_ive_gone_and_made_a_mess : public AchievementCriteriaScript { public: @@ -1250,5 +1285,6 @@ void AddSC_boss_deathbringer_saurfang() new spell_deathbringer_rune_of_blood(); new spell_deathbringer_blood_nova(); new spell_deathbringer_blood_nova_targeting(); + new spell_deathbringer_boiling_blood(); new achievement_ive_gone_and_made_a_mess(); } -- cgit v1.2.3 From 3fde27c96436a2ff97d77aff0d608862a95cda90 Mon Sep 17 00:00:00 2001 From: click Date: Sun, 26 Jun 2011 12:20:58 +0200 Subject: Core/DBC: Update spell_dbc entry for 24308 (Summon Shade of Jin'Do) to use the correct spelleffect (SPELL_EFFECT_SUMMON), and not SPELL_EFFECT_JUMP Also setting the creature relation through the same entry (this might need a minor change, no data for this exists) --- sql/updates/world/2011_06_26_03_world_spell_dbc.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2011_06_26_03_world_spell_dbc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2011_06_26_03_world_spell_dbc.sql b/sql/updates/world/2011_06_26_03_world_spell_dbc.sql new file mode 100644 index 00000000000..d618976707c --- /dev/null +++ b/sql/updates/world/2011_06_26_03_world_spell_dbc.sql @@ -0,0 +1 @@ +UPDATE `spell_dbc` SET `Effect1`=28, `EffectMiscValueB1`=64 WHERE `Id`=24308; -- cgit v1.2.3