josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Update to Mangos 7076.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-01-12 21:58:01 -06:00
parent 5f3418c80c
commit 78e92e9023
14 changed files with 3154 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/SharedDefines.h
+1 -1
View File
@@ -694,7 +694,7 @@ enum AuraState
AURA_STATE_DEFENSE = 1, // C |
AURA_STATE_HEALTHLESS_20_PERCENT = 2, // CcT |
AURA_STATE_BERSERKING = 3, // C T |
//AURA_STATE_UNKNOWN4 = 4, // c t| some limitation to charge spells (?) and target test spells
AURA_STATE_FROZEN = 4, // c t| frozen target
AURA_STATE_JUDGEMENT = 5, // C |
//AURA_STATE_UNKNOWN6 = 6, // | not used
AURA_STATE_HUNTER_PARRY = 7, // C |
src/game/Spell.cpp
+1 -1
View File
@@ -303,7 +303,7 @@ Spell::Spell( Unit* Caster, SpellEntry const *info, bool triggered, uint64 origi
break;
default:
// Wands
if (m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_REQ_WAND)
if (m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_AUTOREPEAT_FLAG)
m_attackType = RANGED_ATTACK;
else
m_attackType = BASE_ATTACK;
src/game/SpellAuras.cpp
+4
View File
@@ -3479,6 +3479,10 @@ void Aura::HandleAuraModRoot(bool apply, bool Real)
if(!Real)
return;
// Frost root aura -> freeze/unfreeze target
if (GetSpellSchoolMask(m_spellProto) & SPELL_SCHOOL_MASK_FROST)
m_target->ModifyAuraState(AURA_STATE_FROZEN, apply);
m_target->SetControlled(apply, UNIT_STAT_ROOT);
}
src/game/SpellAuras.h
+1 -2
View File
@@ -304,8 +304,6 @@ class TRINITY_DLL_SPEC Aura
void _AddAura();
void _RemoveAura();
void TriggerSpell();
bool IsUpdated() { return m_updated; }
void SetUpdated(bool val) { m_updated = val; }
void SetRemoveMode(AuraRemoveMode mode) { m_removeMode = mode; }
@@ -319,6 +317,7 @@ class TRINITY_DLL_SPEC Aura
void setDiminishGroup(DiminishingGroup group) { m_AuraDRGroup = group; }
DiminishingGroup getDiminishGroup() const { return m_AuraDRGroup; }
void TriggerSpell();
void PeriodicTick();
void PeriodicDummyTick();
src/game/SpellEffects.cpp
+26 -12
View File
@@ -1731,6 +1731,8 @@ void Spell::EffectDummy(uint32 i)
//Shaman Rockbiter Weapon
if (m_spellInfo->SpellFamilyFlags == 0x400000)
{
// TODO: use expect spell for enchant (if exist talent)
// In 3.0.3 no mods present for rockbiter
uint32 spell_id = 0;
switch(m_spellInfo->Id)
{
@@ -1738,11 +1740,6 @@ void Spell::EffectDummy(uint32 i)
case 8018: spell_id = 36750; break; // Rank 2
case 8019: spell_id = 36755; break; // Rank 3
case 10399: spell_id = 36759; break; // Rank 4
case 16314: spell_id = 36763; break; // Rank 5
case 16315: spell_id = 36766; break; // Rank 6
case 16316: spell_id = 36771; break; // Rank 7
case 25479: spell_id = 36775; break; // Rank 8
case 25485: spell_id = 36499; break; // Rank 9
default:
sLog.outError("Spell::EffectDummy: Spell %u not handled in RW",m_spellInfo->Id);
return;
@@ -1791,7 +1788,29 @@ void Spell::EffectDummy(uint32 i)
m_caster->CastCustomSpell(unitTarget,39609,&EffectBasePoints0,NULL,NULL,true,NULL,NULL,m_originalCasterGUID);
return;
}
// Lava Lash
if (m_spellInfo->SpellFamilyFlags2 & 0x00000004)
{
if (m_caster->GetTypeId()!=TYPEID_PLAYER)
return;
Item *item = ((Player*)m_caster)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND);
if (item)
{
// Damage is increased if your off-hand weapon is enchanted with Flametongue.
Unit::AuraList const& auraDummy = m_caster->GetAurasByType(SPELL_AURA_DUMMY);
for(Unit::AuraList::const_iterator itr = auraDummy.begin(); itr != auraDummy.end(); ++itr)
{
if( (*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_SHAMAN &&
(*itr)->GetSpellProto()->SpellFamilyFlags & 0x0000000000200000LL &&
(*itr)->GetCastItemGUID() == item->GetGUID())
{
m_damage += m_damage * damage / 100;
return;
}
}
}
return;
}
break;
}
@@ -2050,12 +2069,7 @@ void Spell::EffectTriggerMissileSpell(uint32 effect_idx)
if (m_CastItem)
DEBUG_LOG("WORLD: cast Item spellId - %i", spellInfo->Id);
Spell *spell = new Spell(m_caster, spellInfo, true, m_originalCasterGUID );
SpellCastTargets targets;
targets.setDestination(m_targets.m_destX,m_targets.m_destY,m_targets.m_destZ);
spell->m_CastItem = m_CastItem;
spell->prepare(&targets, NULL);
m_caster->CastSpell(m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, spellInfo->Id, true, m_CastItem, 0, m_originalCasterGUID);
}
void Spell::EffectTeleportUnits(uint32 i)
src/game/SpellMgr.cpp
+7 -14
View File
@@ -361,6 +361,13 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
if (spellInfo->Dispel == DISPEL_POISON)
return SPELL_STING;
// only hunter aspects have this (but not all aspects in hunter family)
if( spellInfo->SpellFamilyFlags & 0x0044000000380000LL || spellInfo->SpellFamilyFlags2 & 0x00003010)
return SPELL_ASPECT;
if( spellInfo->SpellFamilyFlags2 & 0x00000002 )
return SPELL_TRACKER;
break;
}
case SPELLFAMILY_PALADIN:
@@ -405,20 +412,6 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
return SPELL_WARLOCK_ARMOR;
}
// only hunter aspects have this (but not all aspects in hunter family)
if( spellInfo->activeIconID == 122 && (GetSpellSchoolMask(spellInfo) & SPELL_SCHOOL_MASK_NATURE) &&
(spellInfo->Attributes & 0x50000) != 0 && (spellInfo->Attributes & 0x9000010) == 0)
{
return SPELL_ASPECT;
}
for(int i = 0; i < 3; i++)
if( spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AURA && (
spellInfo->EffectApplyAuraName[i] == SPELL_AURA_TRACK_CREATURES ||
spellInfo->EffectApplyAuraName[i] == SPELL_AURA_TRACK_RESOURCES ||
spellInfo->EffectApplyAuraName[i] == SPELL_AURA_TRACK_STEALTHED ) )
return SPELL_TRACKER;
// elixirs can have different families, but potion most ofc.
if(SpellSpecific sp = spellmgr.GetSpellElixirSpecific(spellInfo->Id))
return sp;
src/game/Unit.cpp
+1 -5
View File
@@ -10114,11 +10114,7 @@ void CharmInfo::SetPetNumber(uint32 petnumber, bool statwindow)
bool Unit::isFrozen() const
{
AuraList const& mRoot = GetAurasByType(SPELL_AURA_MOD_ROOT);
for(AuraList::const_iterator i = mRoot.begin(); i != mRoot.end(); ++i)
if( GetSpellSchoolMask((*i)->GetSpellProto()) & SPELL_SCHOOL_MASK_FROST)
return true;
return false;
return HasAuraState(AURA_STATE_FROZEN);
}
struct ProcTriggeredData
src/shared/revision_nr.h
+1 -1
View File
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "7072"
#define REVISION_NR "7076"
#endif // __REVISION_NR_H__