diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-10-10 10:29:18 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-10-10 10:29:18 -0500 |
| commit | a8fa67c53ce0a75b3578a5cb5cdb8c18b552f696 (patch) | |
| tree | 6270448cfbf2c66b0ca4c849d0df68572ecf2ed0 /src/server/scripts | |
| parent | 1f699f2cd300895a5889d24d7513b09b544638ff (diff) | |
| parent | ecc2362c69e24b2afc762bc32d11453d537a84fb (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/World/World.cpp
src/server/game/World/World.h
Diffstat (limited to 'src/server/scripts')
3 files changed, 4 insertions, 2 deletions
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 676cd7be4f0..9ee3428c7dd 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -168,7 +168,7 @@ public: void Reset() { - uiDarkOffering = urand(290, 10); + uiDarkOffering = urand(200, 1000); } void UpdateAI(uint32 const uiDiff) diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index b6a4c40abdd..31b7787623c 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -86,7 +86,7 @@ public: uiConsumeTimer = 15*IN_MILLISECONDS; uiAuraCountTimer = 15500; uiCrushTimer = urand(1*IN_MILLISECONDS, 5*IN_MILLISECONDS); - uiInfectedWoundTimer = urand(60*IN_MILLISECONDS, 10*IN_MILLISECONDS); + uiInfectedWoundTimer = urand(10*IN_MILLISECONDS, 60*IN_MILLISECONDS); uiExplodeCorpseTimer = 3*IN_MILLISECONDS; uiSpawnTimer = urand(30*IN_MILLISECONDS, 40*IN_MILLISECONDS); diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 9c922f2c6fb..9d0e084cfb8 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -32,6 +32,7 @@ enum HunterSpells { HUNTER_SPELL_READINESS = 23989, + DRAENEI_SPELL_GIFT_OF_THE_NAARU = 59543, HUNTER_SPELL_BESTIAL_WRATH = 19574, HUNTER_PET_SPELL_LAST_STAND_TRIGGERED = 53479, HUNTER_PET_HEART_OF_THE_PHOENIX = 55709, @@ -340,6 +341,7 @@ class spell_hun_readiness : public SpellScriptLoader spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER && spellInfo->Id != HUNTER_SPELL_READINESS && spellInfo->Id != HUNTER_SPELL_BESTIAL_WRATH && + spellInfo->Id != DRAENEI_SPELL_GIFT_OF_THE_NAARU && spellInfo->GetRecoveryTime() > 0) caster->RemoveSpellCooldown((itr++)->first, true); else |