Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Merge...

Browse Source 
--HG--
branch : trunk
This commit is contained in:
XTZGZoReX
2010-01-14 18:33:27 +01:00
parent 91ee03d9bf bf6c5b3ee6
commit 20df99ae74
3 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/updates/7037_world_creature_template.sql Normal file
View File

@@ -0,0 +1,7 @@
-- Usually creature_template changes MUST GO to TDB
-- However, this is the one exception ... the GM waypoint
-- DO NOT REMOVE THIS FROM CORE REPO this is part of the core :)
-- Set Waypoint (Only GM can see it) so health is 1 from levels 1 - 80
UPDATE `creature_template` SET `maxlevel`=80,`Health_mod`=0.0125 WHERE `entry`=1;
-- Set Waypoint (Only GM can see it) so it can also show altitude
UPDATE `creature_template` SET InhabitType=7 WHERE `entry`=1;

1
src/game/Level2.cpp
View File

@@ -3058,6 +3058,7 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
{
wpCreature->SetDisplayId(target->GetDisplayId());
wpCreature->SetFloatValue(OBJECT_FIELD_SCALE_X, 0.5);
wpCreature->SetLevel(point);
}
}
while( result->NextRow() );

31
src/game/Unit.cpp
View File

@@ -9847,9 +9847,29 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
if (pVictim->GetDiseasesByCaster(owner->GetGUID()) > 0)
DoneTotalMod *= (100.0f + aurEff->GetAmount()) / 100.0f;
// This is not a typo - Impurity has SPELLFAMILY_DRUID
if (AuraEffect * aurEff = GetDummyAuraEffect(SPELLFAMILY_DRUID, 1986, 0))
ApCoeffMod *= (100.0f + aurEff->GetAmount()) / 100.0f;
// Impurity (dummy effect)
if (GetTypeId() == TYPEID_PLAYER)
{
PlayerSpellMap playerSpells = ((Player*)this)->GetSpellMap();
for (PlayerSpellMap::const_iterator itr = playerSpells.begin(); itr != playerSpells.end(); ++itr)
{
if (itr->second->state == PLAYERSPELL_REMOVED || itr->second->disabled)
continue;
switch (itr->first)
{
case 49220:
case 49633:
case 49635:
case 49636:
case 49638:
{
if (const SpellEntry *proto=sSpellStore.LookupEntry(itr->first))
ApCoeffMod *= (100.0f + proto->CalculateSimpleValue(0)) / 100.0f;
}
break;
}
}
}
break;
}
@@ -10815,11 +10835,6 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage, WeaponAttackType att
normalized = true;
break;
}
// This is not a typo - Impurity has SPELLFAMILY_DRUID
if (AuraEffect const * aurEff = GetDummyAuraEffect(SPELLFAMILY_DRUID, 1986, 0))
APbonus *= (100.0f + aurEff->GetAmount()) / 100.0f;
DoneFlatBenefit += int32(APbonus/14.0f * GetAPMultiplier(attType,normalized));
}