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

fix CRLF in last 3-4 commits, take note, new devs using windows need to configure the win32text extension properly before pushing anything else.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Paradox
2009-12-19 23:42:19 -05:00
parent 9218ebce9d
commit a21f0da24f
3 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/northrend/zuldrak.cpp
+52 -52
View File
@@ -32,58 +32,58 @@ enum eDrakuruShackles
NPC_RAGECLAW = 29686
};
struct TRINITY_DLL_DECL npc_drakuru_shacklesAI : public ScriptedAI
{
npc_drakuru_shacklesAI(Creature* pCreature) : ScriptedAI(pCreature) {}
Unit* Rageclaw;
void Reset()
{
Rageclaw = NULL;
m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
float x, y, z;
m_creature->GetClosePoint(x, y, z, m_creature->GetObjectSize() / 3, 0.1f);
if (Unit* summon = m_creature->SummonCreature(NPC_RAGECLAW, x, y, z,
0, TEMPSUMMON_DEAD_DESPAWN, 1000))
{
Rageclaw = summon;
LockRageclaw();
}
}
void LockRageclaw()
{
m_creature->SetInFront(Rageclaw);
Rageclaw->SetInFront(m_creature);
DoCast(Rageclaw, SPELL_LEFT_CHAIN, true);
DoCast(Rageclaw, SPELL_RIGHT_CHAIN, true);
}
void UnlockRageclaw(Unit* pWho)
{
if (!pWho)
return;
DoCast(Rageclaw, SPELL_FREE_RAGECLAW, true);
m_creature->setDeathState(DEAD);
}
void SpellHit(Unit* pCaster, const SpellEntry* pSpell)
{
if (pSpell->Id == SPELL_UNLOCK_SHACKLE)
{
if (Rageclaw)
UnlockRageclaw(pCaster);
else
m_creature->setDeathState(JUST_DIED);
}
}
};
struct TRINITY_DLL_DECL npc_drakuru_shacklesAI : public ScriptedAI
{
npc_drakuru_shacklesAI(Creature* pCreature) : ScriptedAI(pCreature) {}
Unit* Rageclaw;
void Reset()
{
Rageclaw = NULL;
m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
float x, y, z;
m_creature->GetClosePoint(x, y, z, m_creature->GetObjectSize() / 3, 0.1f);
if (Unit* summon = m_creature->SummonCreature(NPC_RAGECLAW, x, y, z,
0, TEMPSUMMON_DEAD_DESPAWN, 1000))
{
Rageclaw = summon;
LockRageclaw();
}
}
void LockRageclaw()
{
m_creature->SetInFront(Rageclaw);
Rageclaw->SetInFront(m_creature);
DoCast(Rageclaw, SPELL_LEFT_CHAIN, true);
DoCast(Rageclaw, SPELL_RIGHT_CHAIN, true);
}
void UnlockRageclaw(Unit* pWho)
{
if (!pWho)
return;
DoCast(Rageclaw, SPELL_FREE_RAGECLAW, true);
m_creature->setDeathState(DEAD);
}
void SpellHit(Unit* pCaster, const SpellEntry* pSpell)
{
if (pSpell->Id == SPELL_UNLOCK_SHACKLE)
{
if (Rageclaw)
UnlockRageclaw(pCaster);
else
m_creature->setDeathState(JUST_DIED);
}
}
};
CreatureAI* GetAI_npc_drakuru_shackles(Creature* pCreature)
src/game/SpellEffects.cpp
+7 -7
View File
@@ -437,13 +437,13 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
damage = uint32(damage * (m_caster->GetTotalAttackPowerValue(BASE_ATTACK)) / 100);
// Shield Slam
else if(m_spellInfo->SpellFamilyFlags[1] & 0x200 && m_spellInfo->Category == 1209)
{
damage += int32(m_caster->GetShieldBlockValue());
// Glyph of Shield Slam
if (m_caster->HasAura(58375))
m_caster->CastSpell(m_caster, 58374, true);
}
{
damage += int32(m_caster->GetShieldBlockValue());
// Glyph of Shield Slam
if (m_caster->HasAura(58375))
m_caster->CastSpell(m_caster, 58374, true);
}
// Victory Rush
else if(m_spellInfo->SpellFamilyFlags[1] & 0x100)
src/game/Unit.cpp
+3 -3
View File
@@ -10270,9 +10270,9 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint
TakenTotalMod *= (HealingWay->GetAmount() + 100.0f) / 100.0f;
}
// Tenacity increase healing % taken
if (AuraEffect const* Tenacity = pVictim->GetAuraEffect(58549, 0))
TakenTotalMod *= (Tenacity->GetAmount() + 100.0f) / 100.0f;
// Tenacity increase healing % taken
if (AuraEffect const* Tenacity = pVictim->GetAuraEffect(58549, 0))
TakenTotalMod *= (Tenacity->GetAmount() + 100.0f) / 100.0f;
// Healing taken percent