diff --git a/sql/updates/285_world.sql b/sql/updates/285_world.sql index 146947f597..ec0fcc989b 100644 --- a/sql/updates/285_world.sql +++ b/sql/updates/285_world.sql @@ -1,4 +1,4 @@ --- general stuff +-- general stuff REPLACE INTO gameobject_template VALUES (178364,1,5773,"Horde Banner","",84,0,1,0,1479,196608,180101,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""); REPLACE INTO gameobject_template VALUES (178365,1,5771,"Alliance Banner","",83,0,1,0,1479,196608,180100,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""); @@ -18,7 +18,7 @@ REPLACE INTO gameobject_template VALUES (180423,6,266,"Neutral Banner Aura, Larg REPLACE INTO gameobject_template VALUES (180424,0,3751,"Alterac Valley Gate","",100,0,3.5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,""); -- following is the player loot.. it takes the id 1 - be sure that i don't delete anything -REPLACE INTO `world`.`creature_loot_template` (`entry` ,`item` ,`ChanceOrQuestChance` ,`groupid` ,`mincountOrRef` ,`maxcount` ,`lootcondition` ,`condition_value1` ,`condition_value2`) +REPLACE INTO `creature_loot_template` (`entry` ,`item` ,`ChanceOrQuestChance` ,`groupid` ,`mincountOrRef` ,`maxcount` ,`lootcondition` ,`condition_value1` ,`condition_value2`) VALUES ('1', '17306', '33', '0', '5', '15', '6', '67', '0'), ('1', '17422', '100', '0', '20', '40', '0', '0', '0'), ('1', '17423', '33', '0', '5', '15', '6', '469', '0'), diff --git a/sql/updates/488_trinity_script_text.sql b/sql/updates/488_trinity_script_text.sql index a9d1aed26f..d135826678 100644 --- a/sql/updates/488_trinity_script_text.sql +++ b/sql/updates/488_trinity_script_text.sql @@ -363,7 +363,7 @@ INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`, (-1509014,'Warriors! Captains! Continue the fight!',8613,1,0,'rajaxx SAY_UNK4'), (-1509015,'You are not worth my time $N!',8614,1,0,'rajaxx SAY_DEAGGRO'), (-1509016,'Breath your last!',8604,1,0,'rajaxx SAY_KILLS_ANDOROV'), -(-1509017,'Soon you will know the price of your meddling, mortals... The master is nearly whole... And when he rises, your world will be cease!',0,1,0,'rajaxx SAY_COMPLETE_QUEST'); +(-1509017,'Soon you will know the price of your meddling, mortals... The master is nearly whole... And when he rises, your world will be cease!',0,1,0,'rajaxx SAY_COMPLETE_QUEST'), (-1509018,'I am rejuvinated!',8593,1,0,'ossirian SAY_SURPREME1'), (-1509019,'My powers are renewed!',8595,1,0,'ossirian SAY_SURPREME2'), (-1509020,'My powers return!',8596,1,0,'ossirian SAY_SURPREME3'), diff --git a/src/bindings/scripts/VC71/71ScriptDev2.vcproj b/src/bindings/scripts/VC71/71ScriptDev2.vcproj index 0f009b85e2..374f312771 100644 --- a/src/bindings/scripts/VC71/71ScriptDev2.vcproj +++ b/src/bindings/scripts/VC71/71ScriptDev2.vcproj @@ -1,7 +1,7 @@ +/* Copyright (C) 2006 - 2008 ScriptDev2 * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or diff --git a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp index fbb4c20379..3449b863a2 100644 --- a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp +++ b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp @@ -444,8 +444,7 @@ struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI DoCast(target, SPELL_MANA_BURN); ManaBurnTimer = 8000 + (rand()%10 * 1000); // 8-18 sec cd } - } - else ManaBurnTimer -= diff; + }else ManaBurnTimer -= diff; if(!Weak && m_creature->GetHealth() < (m_creature->GetMaxHealth() / 100 * WeakPercent) && target->GetQuestStatus(10190) == QUEST_STATUS_INCOMPLETE) // start: support for quest 10190 { @@ -473,6 +472,8 @@ struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI DrainedPhaseHunter->AI()->AttackStart(target); } } // end: support for quest 10190 + + DoMeleeAttackIfReady(); } }; diff --git a/src/game/RandomMovementGenerator.cpp b/src/game/RandomMovementGenerator.cpp index cb7cb6ffcd..311cc7c6e1 100644 --- a/src/game/RandomMovementGenerator.cpp +++ b/src/game/RandomMovementGenerator.cpp @@ -27,6 +27,17 @@ #define RUNNING_CHANCE_RANDOMMV 20 //will be "1 / RUNNING_CHANCE_RANDOMMV" +template<> +bool +RandomMovementGenerator::GetDestination(float &x, float &y, float &z) const +{ + if(i_destinationHolder.HasArrived()) + return false; + + i_destinationHolder.GetDestination(x, y, z); + return true; +} + template<> void RandomMovementGenerator::_setRandomLocation(Creature &creature) diff --git a/src/game/RandomMovementGenerator.h b/src/game/RandomMovementGenerator.h index 2825bc306a..dd6e3a4828 100644 --- a/src/game/RandomMovementGenerator.h +++ b/src/game/RandomMovementGenerator.h @@ -38,7 +38,8 @@ class TRINITY_DLL_SPEC RandomMovementGenerator void Finalize(T &) {} void Reset(T &); bool Update(T &, const uint32 &); - void UpdateMapPosition(uint32 mapid, float &x ,float &y, float &z) + bool GetDestination(float &x, float &y, float &z) const; + void UpdateMapPosition(uint32 mapid, float &x ,float &y, float &z) { i_destinationHolder.GetLocationNow(mapid, x,y,z); } diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 1face06a8c..c01412ce5c 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -8632,6 +8632,11 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3 { CastingTime = 0; } + // Darkmoon Card: Vengeance - 0.1% + else if (spellProto->SpellVisual == 9850 && spellProto->SpellIconID == 2230) + { + CastingTime = 3.5; + } case SPELLFAMILY_MAGE: // Ignite - do not modify, it is (8*Rank)% damage of procing Spell if(spellProto->Id==12654)