diff options
Diffstat (limited to 'src')
10 files changed, 28 insertions, 10 deletions
diff --git a/src/bindings/scripts/VC71/71ScriptDev2.vcproj b/src/bindings/scripts/VC71/71ScriptDev2.vcproj index 0f009b85e21..374f3127711 100644 --- a/src/bindings/scripts/VC71/71ScriptDev2.vcproj +++ b/src/bindings/scripts/VC71/71ScriptDev2.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="windows-1251"?> <VisualStudioProject ProjectType="Visual C++" - Version="9,00" + Version="7,10" Name="TrinityScript" ProjectGUID="{4295C8A9-79B7-4354-8064-F05FB9CA0C96}" RootNamespace="ScriptDev2" diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj index e439c7820a7..20fd76033fc 100644 --- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj +++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9,00" + Version="8,00" Name="TrinityScript" ProjectGUID="{4295C8A9-79B7-4354-8064-F05FB9CA0C96}" RootNamespace="ScriptDev2" diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp index 07adcf4b225..fba07fd8f2a 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp @@ -56,7 +56,7 @@ EndScriptData */ #define SPELL_ENRAGE 27680 //this spell need verification #define SPELL_SUMMON_WATER_ELEMENT 36459 //not in use yet(in use ever?) #define SPELL_ELEMENTAL_SPAWNIN 25035 -#define SPELL_BLUE_BEAM /*40227*/38015 //channeled Hydross Beam Helper (not in use yet) +#define SPELL_BLUE_BEAM /*40227*/40227 //channeled Hydross Beam Helper (not in use yet) #define ENTRY_PURE_SPAWN 22035 #define ENTRY_TAINTED_SPAWN 22036 diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp index ff6669b35a4..58bdc505fbf 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp @@ -170,7 +170,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI Entangle_Timer = 30000; StaticCharge_Timer = 10000+rand()%15000; ForkedLightning_Timer = 2000; - Check_Timer = 1000; + Check_Timer = 15000; EnchantedElemental_Timer = 5000; TaintedElemental_Timer = 50000; CoilfangElite_Timer = 45000+rand()%5000; @@ -468,7 +468,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI if(!InMeleeRange) CastShootOrMultishot(); - Check_Timer = 1000; + Check_Timer = 5000; }else Check_Timer -= diff; } //Phase 2 diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp index b2bcadffff0..8be276954c0 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: boss_the_lurker_below SD%Complete: 80 -SDComment: +SDComment: Scalding Water other things. SDCategory: The Lurker Below EndScriptData */ diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp index b6884e56538..c635f4c6ad5 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp @@ -1,4 +1,4 @@ -tet/* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> +/* Copyright (C) 2006 - 2008 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> * 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 fbb4c20379b..3449b863a27 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 cb7cb6ffcda..311cc7c6e17 100644 --- a/src/game/RandomMovementGenerator.cpp +++ b/src/game/RandomMovementGenerator.cpp @@ -28,6 +28,17 @@ #define RUNNING_CHANCE_RANDOMMV 20 //will be "1 / RUNNING_CHANCE_RANDOMMV" template<> +bool +RandomMovementGenerator<Creature>::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<Creature>::_setRandomLocation(Creature &creature) { diff --git a/src/game/RandomMovementGenerator.h b/src/game/RandomMovementGenerator.h index 2825bc306a8..dd6e3a48283 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 1face06a8c1..c01412ce5c7 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) |