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

Merge branch 'master' of https://github.com/TrinityCore/TrinityCore

Browse Source
This commit is contained in:
Subv
2012-05-13 19:40:05 -05:00
parent 1a06e197fd 72d00c476c
commit e74135946d
5 changed files with 73 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/world/2012_05_13_01_world_creature_text.sql
+14
View File
@@ -0,0 +1,14 @@
-- NPC talk text insert for Sara
DELETE FROM `creature_text` WHERE `entry`=33134;
INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
(33134,0,0, 'Help me! Please get them off me!',14,0,100,0,0,15771, 'Sara YELL_PREFIGHT'),
(33134,0,1, 'What do you want from me? Leave me alone!',14,0,100,0,0,15772, 'Sara YELL_PREFIGHT'),
(33134,1,0, 'Yes! YES! Show them no mercy! Give no pause to your attacks!',14,0,100,0,0,15773, 'Sara YELL_COMBAT_PHASE_1'),
(33134,1,1, 'Let hatred and rage guide your blows!',14,0,100,0,0,15774, 'Sara YELL_COMBAT_PHASE_1'),
(33134,1,2, 'The time to strike at the head of the beast will soon be upon us! Focus your anger and hatred on his minions!',14,0,100,457,0,15775, 'Sara YELL_COMBAT_PHASE_1'),
(33134,2,0, 'Suffocate upon your own hate!',14,0,100,0,0,15776, 'Sara YELL_COMBAT_PHASE_2'),
(33134,2,1, 'Tremble, mortals, before the coming of the end!',14,0,100,0,0,15777, 'Sara YELL_COMBAT_PHASE_2'),
(33134,3,0, 'Powerless to act...',14,0,100,0,0,15778, 'Sara YELL_SLAY'),
(33134,3,1, 'Could they have been saved?',14,0,100,0,0,15779, 'YELL SAY_SLAY');
-- remove script text
DELETE FROM script_texts WHERE entry BETWEEN -1603319 AND -1603310;
src/server/game/Entities/Unit/Unit.cpp
+9 -9
View File
@@ -10600,7 +10600,7 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin
break; break;
} }
} }
break; break;
case SPELLFAMILY_PRIEST: case SPELLFAMILY_PRIEST:
// Mind Flay // Mind Flay
if (spellProto->SpellFamilyFlags[0] & 0x800000) if (spellProto->SpellFamilyFlags[0] & 0x800000)
@@ -10633,7 +10633,7 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin
if (victim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT)) if (victim->HasAuraState(AURA_STATE_HEALTHLESS_35_PERCENT))
AddPctN(DoneTotalMod, aurEff->GetAmount()); AddPctN(DoneTotalMod, aurEff->GetAmount());
} }
break; break;
case SPELLFAMILY_PALADIN: case SPELLFAMILY_PALADIN:
// Judgement of Vengeance/Judgement of Corruption // Judgement of Vengeance/Judgement of Corruption
if ((spellProto->SpellFamilyFlags[1] & 0x400000) && spellProto->SpellIconID == 2292) if ((spellProto->SpellFamilyFlags[1] & 0x400000) && spellProto->SpellIconID == 2292)
@@ -10651,7 +10651,7 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin
if (stacks) if (stacks)
AddPctU(DoneTotalMod, 10 * stacks); AddPctU(DoneTotalMod, 10 * stacks);
} }
break; break;
case SPELLFAMILY_DRUID: case SPELLFAMILY_DRUID:
// Thorns // Thorns
if (spellProto->SpellFamilyFlags[0] & 0x100) if (spellProto->SpellFamilyFlags[0] & 0x100)
@@ -10660,7 +10660,7 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin
if (AuraEffect* aurEff = GetAuraEffectOfRankedSpell(16836, 0)) if (AuraEffect* aurEff = GetAuraEffectOfRankedSpell(16836, 0))
AddPctN(DoneTotalMod, aurEff->GetAmount()); AddPctN(DoneTotalMod, aurEff->GetAmount());
} }
break; break;
case SPELLFAMILY_WARLOCK: case SPELLFAMILY_WARLOCK:
// Fire and Brimstone // Fire and Brimstone
if (spellProto->SpellFamilyFlags[1] & 0x00020040) if (spellProto->SpellFamilyFlags[1] & 0x00020040)
@@ -10682,14 +10682,14 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin
if (spellProto->SpellFamilyFlags[1] & 0x00400000 && isPet()) if (spellProto->SpellFamilyFlags[1] & 0x00400000 && isPet())
if (uint8 count = victim->GetDoTsByCaster(GetOwnerGUID())) if (uint8 count = victim->GetDoTsByCaster(GetOwnerGUID()))
AddPctN(DoneTotalMod, 15 * count); AddPctN(DoneTotalMod, 15 * count);
break; break;
case SPELLFAMILY_HUNTER: case SPELLFAMILY_HUNTER:
// Steady Shot // Steady Shot
if (spellProto->SpellFamilyFlags[1] & 0x1) if (spellProto->SpellFamilyFlags[1] & 0x1)
if (AuraEffect* aurEff = GetAuraEffect(56826, 0)) // Glyph of Steady Shot if (AuraEffect* aurEff = GetAuraEffect(56826, 0)) // Glyph of Steady Shot
if (victim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_HUNTER, 0x00004000, 0, 0, GetGUID())) if (victim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_HUNTER, 0x00004000, 0, 0, GetGUID()))
AddPctN(DoneTotalMod, aurEff->GetAmount()); AddPctN(DoneTotalMod, aurEff->GetAmount());
break; break;
case SPELLFAMILY_DEATHKNIGHT: case SPELLFAMILY_DEATHKNIGHT:
// Improved Icy Touch // Improved Icy Touch
if (spellProto->SpellFamilyFlags[0] & 0x2) if (spellProto->SpellFamilyFlags[0] & 0x2)
@@ -10730,7 +10730,7 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin
} }
} }
} }
break; break;
} }
// Done fixed damage bonus auras // Done fixed damage bonus auras
@@ -10751,7 +10751,7 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin
if (bonus->ap_dot_bonus > 0) if (bonus->ap_dot_bonus > 0)
{ {
WeaponAttackType attType = (spellProto->IsRangedWeaponSpell() && spellProto->DmgClass != SPELL_DAMAGE_CLASS_MELEE) ? RANGED_ATTACK : BASE_ATTACK; WeaponAttackType attType = (spellProto->IsRangedWeaponSpell() && spellProto->DmgClass != SPELL_DAMAGE_CLASS_MELEE) ? RANGED_ATTACK : BASE_ATTACK;
float APbonus = (float) victim->GetTotalAuraModifier(attType == BASE_ATTACK ? SPELL_AURA_MELEE_ATTACK_POWER_ATTACKER_BONUS : SPELL_AURA_RANGED_ATTACK_POWER_ATTACKER_BONUS); float APbonus = float(victim->GetTotalAuraModifier(attType == BASE_ATTACK ? SPELL_AURA_MELEE_ATTACK_POWER_ATTACKER_BONUS : SPELL_AURA_RANGED_ATTACK_POWER_ATTACKER_BONUS));
APbonus += GetTotalAttackPowerValue(attType); APbonus += GetTotalAttackPowerValue(attType);
DoneTotal += int32(bonus->ap_dot_bonus * stack * ApCoeffMod * APbonus); DoneTotal += int32(bonus->ap_dot_bonus * stack * ApCoeffMod * APbonus);
} }
@@ -10762,7 +10762,7 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin
if (bonus->ap_bonus > 0) if (bonus->ap_bonus > 0)
{ {
WeaponAttackType attType = (spellProto->IsRangedWeaponSpell() && spellProto->DmgClass != SPELL_DAMAGE_CLASS_MELEE) ? RANGED_ATTACK : BASE_ATTACK; WeaponAttackType attType = (spellProto->IsRangedWeaponSpell() && spellProto->DmgClass != SPELL_DAMAGE_CLASS_MELEE) ? RANGED_ATTACK : BASE_ATTACK;
float APbonus = (float) victim->GetTotalAuraModifier(attType == BASE_ATTACK ? SPELL_AURA_MELEE_ATTACK_POWER_ATTACKER_BONUS : SPELL_AURA_RANGED_ATTACK_POWER_ATTACKER_BONUS); float APbonus = float(victim->GetTotalAuraModifier(attType == BASE_ATTACK ? SPELL_AURA_MELEE_ATTACK_POWER_ATTACKER_BONUS : SPELL_AURA_RANGED_ATTACK_POWER_ATTACKER_BONUS));
APbonus += GetTotalAttackPowerValue(attType); APbonus += GetTotalAttackPowerValue(attType);
DoneTotal += int32(bonus->ap_bonus * stack * ApCoeffMod * APbonus); DoneTotal += int32(bonus->ap_bonus * stack * ApCoeffMod * APbonus);
} }
src/server/game/Spells/SpellEffects.cpp
+2 -2
View File
@@ -1581,12 +1581,12 @@ void Spell::EffectHeal(SpellEffIndex /*effIndex*/)
//addhealth += tickheal * tickcount; //addhealth += tickheal * tickcount;
//addhealth = caster->SpellHealingBonus(m_spellInfo, addhealth, HEAL, unitTarget); //addhealth = caster->SpellHealingBonus(m_spellInfo, addhealth, HEAL, unitTarget);
} }
// Glyph of Nourish // Nourish
else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellFamilyFlags[1] & 0x2000000) else if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellFamilyFlags[1] & 0x2000000)
{ {
addhealth = caster->SpellHealingBonusDone(unitTarget, m_spellInfo, addhealth, HEAL); addhealth = caster->SpellHealingBonusDone(unitTarget, m_spellInfo, addhealth, HEAL);
addhealth = unitTarget->SpellHealingBonusTaken(caster, m_spellInfo, addhealth, HEAL);
// Glyph of Nourish
if (AuraEffect const* aurEff = m_caster->GetAuraEffect(62971, 0)) if (AuraEffect const* aurEff = m_caster->GetAuraEffect(62971, 0))
{ {
Unit::AuraEffectList const& Periodic = unitTarget->GetAuraEffectsByType(SPELL_AURA_PERIODIC_HEAL); Unit::AuraEffectList const& Periodic = unitTarget->GetAuraEffectsByType(SPELL_AURA_PERIODIC_HEAL);
src/server/scripts/EasternKingdoms/BlackrockSpire/blackrock_spire.h
+28 -1
View File
@@ -61,7 +61,34 @@ enum AdditionalData
enum GameObjects enum GameObjects
{ {
GO_WHELP_SPAWNER = 175622, //trap spawned by go id 175124 GO_WHELP_SPAWNER = 175622, // trap spawned by go id 175124
// Doors
GO_EMBERSEER_IN = 175244, // First door to Pyroguard Emberseer
GO_DOORS = 175705, // Second door to Pyroguard Emberseer
GO_EMBERSEER_OUT = 175153, // Door after Pyroguard Emberseer event
GO_GYTH_ENTRY_DOOR = 164726,
GO_GYTH_COMBAT_DOOR = 175185,
GO_GYTH_EXIT_DOOR = 175186,
GO_DRAKKISATH_DOOR_1 = 175946,
GO_DRAKKISATH_DOOR_2 = 175947,
// Runes
GO_ROOM_1_RUNE = 175197,
GO_ROOM_2_RUNE = 175199,
GO_ROOM_3_RUNE = 175195,
GO_ROOM_4_RUNE = 175200,
GO_ROOM_5_RUNE = 175198,
GO_ROOM_6_RUNE = 175196,
GO_ROOM_7_RUNE = 175194,
GO_EMBERSEER_RUNE_1 = 175266,
GO_EMBERSEER_RUNE_2 = 175267,
GO_EMBERSEER_RUNE_3 = 175268,
GO_EMBERSEER_RUNE_4 = 175269,
GO_EMBERSEER_RUNE_5 = 175270,
GO_EMBERSEER_RUNE_6 = 175271,
GO_EMBERSEER_RUNE_7 = 175272,
}; };
#endif #endif
src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
+20 -11
View File
@@ -18,18 +18,27 @@
#include "ScriptMgr.h" #include "ScriptMgr.h"
#include "ulduar.h" #include "ulduar.h"
enum Sara_Yells enum Sara
{ {
SAY_SARA_PREFIGHT_1 = -1603310, // text
SAY_SARA_PREFIGHT_2 = -1603311, YELL_SARA_PREFIGHT = 0,
SAY_SARA_AGGRO_1 = -1603312, YELL_COMBAT_PHASE_1 = 1,
SAY_SARA_AGGRO_2 = -1603313, YELL_COMBAT_PHASE_2 = 2,
SAY_SARA_AGGRO_3 = -1603314, YELL_SLAY = 3,
SAY_SARA_SLAY_1 = -1603315,
SAY_SARA_SLAY_2 = -1603316, // Phase 1 spells
WHISP_SARA_INSANITY = -1603317, SPELL_SARAS_BLESSING = 63745, // Target Self
SAY_SARA_PHASE2_1 = -1603318, SPELL_SARAS_ANGER = 63147, // Target Entry 33136
SAY_SARA_PHASE2_2 = -1603319, SPELL_SARAS_ANGER = 63744, // Target Entry 33136
SPELL_SARAS_FEVOR = 63138, // Target Player
SPELL_SARAS_FEVOR = 63747, // Target Player
SPELL_SARAS_BLESSING = 63134, // Target Player
// Phase 2 spells
SPELL_PHYCHOSIS = 63795, // Target Self
SPELL_MALADY_OF_THE_MIND = 63830, // Target Self
SPELL_DEATH_RAY = 63891, // Target Self
SPELL_BRAIN_LINK = 63802, // Target Self
}; };
enum YoggSaron_Yells enum YoggSaron_Yells