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

Core/Misc:

Browse Source 
- Replace emote magic number by enum
- Added all missing defines from AnimationData.dbc. Minor corrections to existing ones. Standardized some naming and updated cpp files as needed.
- Correct a spell used in AQ
Closes #3787
Closes #5095
This commit is contained in:
Matthew Goff
2012-02-06 01:22:45 +00:00
committed by Nay
parent 5019e9d353
commit 7a117dd429
19 changed files with 713 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/world/2011_02_05_04_world_misc.sql → sql/updates/world/2012_02_05_04_world_misc.sql
View File
sql/updates/world/2011_02_05_04_world_quest_template.sql → sql/updates/world/2012_02_05_04_world_quest_template.sql
View File
src/server/game/Entities/Unit/Unit.cpp
+2 -2
View File
@@ -1286,9 +1286,9 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss)
// Hmmmm dont like this emotes client must by self do all animations // Hmmmm dont like this emotes client must by self do all animations
if (damageInfo->HitInfo & HITINFO_CRITICALHIT) if (damageInfo->HitInfo & HITINFO_CRITICALHIT)
victim->HandleEmoteCommand(EMOTE_ONESHOT_WOUNDCRITICAL); victim->HandleEmoteCommand(EMOTE_ONESHOT_WOUND_CRITICAL);
if (damageInfo->blocked_amount && damageInfo->TargetState != VICTIMSTATE_BLOCKS) if (damageInfo->blocked_amount && damageInfo->TargetState != VICTIMSTATE_BLOCKS)
victim->HandleEmoteCommand(EMOTE_ONESHOT_PARRYSHIELD); victim->HandleEmoteCommand(EMOTE_ONESHOT_PARRY_SHIELD);
if (damageInfo->TargetState == VICTIMSTATE_PARRY) if (damageInfo->TargetState == VICTIMSTATE_PARRY)
{ {
src/server/game/Miscellaneous/SharedDefines.h
+690 -403
View File
File diff suppressed because it is too large Load Diff
src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
+2 -2
View File
@@ -1238,10 +1238,10 @@ public:
me->HandleEmoteCommand(EMOTE_ONESHOT_KICK); me->HandleEmoteCommand(EMOTE_ONESHOT_KICK);
break; break;
case 2: case 2:
me->HandleEmoteCommand(EMOTE_ONESHOT_ATTACKUNARMED); me->HandleEmoteCommand(EMOTE_ONESHOT_ATTACK_UNARMED);
break; break;
case 3: case 3:
me->HandleEmoteCommand(EMOTE_ONESHOT_ATTACKUNARMED); me->HandleEmoteCommand(EMOTE_ONESHOT_ATTACK_UNARMED);
break; break;
case 4: case 4:
me->HandleEmoteCommand(EMOTE_ONESHOT_KICK); me->HandleEmoteCommand(EMOTE_ONESHOT_KICK);
src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ public:
case 2: case 2:
if (!player->isRessurectRequested()) if (!player->isRessurectRequested())
{ {
me->HandleEmoteCommand(EMOTE_ONESHOT_CUSTOMSPELL01); me->HandleEmoteCommand(EMOTE_ONESHOT_CUSTOM_SPELL_01);
DoCast(player, SPELL_REVIVE, true); DoCast(player, SPELL_REVIVE, true);
me->MonsterWhisper(VALK_WHISPER, player->GetGUID()); me->MonsterWhisper(VALK_WHISPER, player->GetGUID());
} }
src/server/scripts/EasternKingdoms/westfall.cpp
+2 -2
View File
@@ -110,7 +110,7 @@ public:
case 4: case 4:
SetEquipmentSlots(false, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE, EQUIP_ID_RIFLE); SetEquipmentSlots(false, EQUIP_NO_CHANGE, EQUIP_NO_CHANGE, EQUIP_ID_RIFLE);
me->SetSheath(SHEATH_STATE_RANGED); me->SetSheath(SHEATH_STATE_RANGED);
me->HandleEmoteCommand(EMOTE_STATE_USESTANDING_NOSHEATHE); me->HandleEmoteCommand(EMOTE_STATE_USE_STANDING_NO_SHEATHE);
break; break;
case 7: case 7:
me->SummonCreature(NPC_DEFIAS_RAIDER, -11450.836f, 1569.755f, 54.267f, 4.230f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); me->SummonCreature(NPC_DEFIAS_RAIDER, -11450.836f, 1569.755f, 54.267f, 4.230f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
@@ -141,7 +141,7 @@ public:
case 13: case 13:
SetEquipmentSlots(true); SetEquipmentSlots(true);
me->SetSheath(SHEATH_STATE_UNARMED); me->SetSheath(SHEATH_STATE_UNARMED);
me->HandleEmoteCommand(EMOTE_STATE_USESTANDING_NOSHEATHE); me->HandleEmoteCommand(EMOTE_STATE_USE_STANDING_NO_SHEATHE);
break; break;
case 17: case 17:
player->GroupEventHappens(QUEST_TOME_VALOR, me); player->GroupEventHappens(QUEST_TOME_VALOR, me);
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+1 -1
View File
@@ -678,7 +678,7 @@ public:
} }
if (i == LastOverronPos && IsOverrun) if (i == LastOverronPos && IsOverrun)
{ {
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_ATTACKUNARMED); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_ATTACK_UNARMED);
if ((faction == 0 && LastOverronPos == 17) || (faction == 1 && LastOverronPos == 21)) if ((faction == 0 && LastOverronPos == 17) || (faction == 1 && LastOverronPos == 21))
{ {
me->setDeathState(DEAD); me->setDeathState(DEAD);
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ EndScriptData */
#define SPELL_ARCANE_EXPLOSION 25679 #define SPELL_ARCANE_EXPLOSION 25679
#define SPELL_EARTH_SHOCK 26194 #define SPELL_EARTH_SHOCK 26194
#define SPELL_TRUE_FULFILLMENT4 26526 #define SPELL_TRUE_FULFILLMENT 785
#define SPELL_BLINK 28391 #define SPELL_BLINK 28391
class ov_mycoordinates class ov_mycoordinates
src/server/scripts/Kalimdor/durotar.cpp
+1 -1
View File
@@ -84,7 +84,7 @@ public:
void UpdateAI(const uint32 uiDiff) void UpdateAI(const uint32 uiDiff)
{ {
if (work == true) if (work == true)
me->HandleEmoteCommand(466); me->HandleEmoteCommand(EMOTE_ONESHOT_WORK_CHOPWOOD);
if (m_uiRebuffTimer <= uiDiff) if (m_uiRebuffTimer <= uiDiff)
{ {
DoCast(me, SPELL_BUFF_SLEEP); DoCast(me, SPELL_BUFF_SLEEP);
src/server/scripts/Kalimdor/mulgore.cpp
+1 -1
View File
@@ -171,7 +171,7 @@ public:
break; break;
case 2: case 2:
DoScriptText(EMOTE_EAT_LUNCH, me); DoScriptText(EMOTE_EAT_LUNCH, me);
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USESTANDING); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING);
break; break;
case 3: case 3:
if (Player* unit = Unit::GetPlayer(*me, uiPlayerGUID)) if (Player* unit = Unit::GetPlayer(*me, uiPlayerGUID))
src/server/scripts/Kalimdor/the_barrens.cpp
+1 -1
View File
@@ -512,7 +512,7 @@ public:
//creature->GetMotionMaster()->MovePoint(0, -1693, -4343, 4.32f); //creature->GetMotionMaster()->MovePoint(0, -1693, -4343, 4.32f);
//creature->GetMotionMaster()->MovePoint(1, -1684, -4333, 2.78f); //creature->GetMotionMaster()->MovePoint(1, -1684, -4333, 2.78f);
creature->GetMotionMaster()->MovePoint(2, -1682, -4329, 2.79f); creature->GetMotionMaster()->MovePoint(2, -1682, -4329, 2.79f);
creature->HandleEmoteCommand(EMOTE_STATE_READYUNARMED); creature->HandleEmoteCommand(EMOTE_STATE_READY_UNARMED);
EventBigWill = true; EventBigWill = true;
Wave_Timer = 1000; Wave_Timer = 1000;
} }
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+2 -2
View File
@@ -429,7 +429,7 @@ class npc_fizzlebang_toc : public CreatureScript
case 1130: case 1130:
me->GetMotionMaster()->MovementExpired(); me->GetMotionMaster()->MovementExpired();
DoScriptText(SAY_STAGE_1_03, me); DoScriptText(SAY_STAGE_1_03, me);
me->HandleEmoteCommand(EMOTE_ONESHOT_SPELLCAST_OMNI); me->HandleEmoteCommand(EMOTE_ONESHOT_SPELL_CAST_OMNI);
if (Unit* pTrigger = me->SummonCreature(NPC_TRIGGER, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 4.69494f, TEMPSUMMON_MANUAL_DESPAWN)) if (Unit* pTrigger = me->SummonCreature(NPC_TRIGGER, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 4.69494f, TEMPSUMMON_MANUAL_DESPAWN))
{ {
m_uiTriggerGUID = pTrigger->GetGUID(); m_uiTriggerGUID = pTrigger->GetGUID();
@@ -446,7 +446,7 @@ class npc_fizzlebang_toc : public CreatureScript
m_uiUpdateTimer = 4000; m_uiUpdateTimer = 4000;
break; break;
case 1134: case 1134:
me->HandleEmoteCommand(EMOTE_ONESHOT_SPELLCAST_OMNI); me->HandleEmoteCommand(EMOTE_ONESHOT_SPELL_CAST_OMNI);
if (Creature* pPortal = me->SummonCreature(NPC_WILFRED_PORTAL, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 4.71239f, TEMPSUMMON_MANUAL_DESPAWN)) if (Creature* pPortal = me->SummonCreature(NPC_WILFRED_PORTAL, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 4.71239f, TEMPSUMMON_MANUAL_DESPAWN))
{ {
pPortal->SetReactState(REACT_PASSIVE); pPortal->SetReactState(REACT_PASSIVE);
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+4 -4
View File
@@ -883,7 +883,7 @@ class boss_the_lich_king : public CreatureScript
case EVENT_INTRO_TALK_1: case EVENT_INTRO_TALK_1:
Talk(SAY_LK_INTRO_2); Talk(SAY_LK_INTRO_2);
// for some reason blizz sends 2 emotes in row here so (we handle one in Talk) // for some reason blizz sends 2 emotes in row here so (we handle one in Talk)
me->HandleEmoteCommand(EMOTE_ONESHOT_TALK_NOSHEATHE); me->HandleEmoteCommand(EMOTE_ONESHOT_TALK_NO_SHEATHE);
events.ScheduleEvent(EVENT_EMOTE_CAST_SHOUT, 7000, 0, PHASE_INTRO); events.ScheduleEvent(EVENT_EMOTE_CAST_SHOUT, 7000, 0, PHASE_INTRO);
events.ScheduleEvent(EVENT_INTRO_EMOTE_1, 13000, 0, PHASE_INTRO); events.ScheduleEvent(EVENT_INTRO_EMOTE_1, 13000, 0, PHASE_INTRO);
events.ScheduleEvent(EVENT_EMOTE_CAST_SHOUT, 18000, 0, PHASE_INTRO); events.ScheduleEvent(EVENT_EMOTE_CAST_SHOUT, 18000, 0, PHASE_INTRO);
@@ -893,7 +893,7 @@ class boss_the_lich_king : public CreatureScript
DoCast(me, SPELL_EMOTE_SHOUT_NO_SHEATH, false); DoCast(me, SPELL_EMOTE_SHOUT_NO_SHEATH, false);
break; break;
case EVENT_INTRO_EMOTE_1: case EVENT_INTRO_EMOTE_1:
me->HandleEmoteCommand(EMOTE_ONESHOT_POINT_NOSHEATHE); me->HandleEmoteCommand(EMOTE_ONESHOT_POINT_NO_SHEATHE);
break; break;
case EVENT_INTRO_CAST_FREEZE: case EVENT_INTRO_CAST_FREEZE:
Talk(SAY_LK_INTRO_3); Talk(SAY_LK_INTRO_3);
@@ -1043,7 +1043,7 @@ class boss_the_lich_king : public CreatureScript
DoCastAOE(SPELL_EMOTE_QUESTION_NO_SHEATH); DoCastAOE(SPELL_EMOTE_QUESTION_NO_SHEATH);
break; break;
case EVENT_OUTRO_EMOTE_TALK: case EVENT_OUTRO_EMOTE_TALK:
me->HandleEmoteCommand(EMOTE_ONESHOT_TALK_NOSHEATHE); me->HandleEmoteCommand(EMOTE_ONESHOT_TALK_NO_SHEATHE);
break; break;
case EVENT_OUTRO_TALK_3: case EVENT_OUTRO_TALK_3:
if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING))) if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HIGHLORD_TIRION_FORDRING)))
@@ -1268,7 +1268,7 @@ class npc_tirion_fordring_tft : public CreatureScript
_events.ScheduleEvent(EVENT_INTRO_CHARGE, 5000, 0, PHASE_INTRO); _events.ScheduleEvent(EVENT_INTRO_CHARGE, 5000, 0, PHASE_INTRO);
break; break;
case EVENT_INTRO_EMOTE_1: case EVENT_INTRO_EMOTE_1:
me->HandleEmoteCommand(EMOTE_ONESHOT_POINT_NOSHEATHE); me->HandleEmoteCommand(EMOTE_ONESHOT_POINT_NO_SHEATHE);
break; break;
case EVENT_INTRO_CHARGE: case EVENT_INTRO_CHARGE:
me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+1 -1
View File
@@ -477,7 +477,7 @@ class npc_highlord_tirion_fordring_lh : public CreatureScript
Talk(SAY_TIRION_INTRO_3); Talk(SAY_TIRION_INTRO_3);
break; break;
case EVENT_LK_INTRO_1: case EVENT_LK_INTRO_1:
me->HandleEmoteCommand(EMOTE_ONESHOT_POINT_NOSHEATHE); me->HandleEmoteCommand(EMOTE_ONESHOT_POINT_NO_SHEATHE);
if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _theLichKing)) if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _theLichKing))
theLichKing->AI()->Talk(SAY_LK_INTRO_1); theLichKing->AI()->Talk(SAY_LK_INTRO_1);
break; break;
src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+1 -1
View File
@@ -354,7 +354,7 @@ class boss_gothik : public CreatureScript
} }
if (spellId && me->isInCombat()) if (spellId && me->isInCombat())
{ {
me->HandleEmoteCommand(EMOTE_ONESHOT_SPELLCAST); me->HandleEmoteCommand(EMOTE_ONESHOT_SPELL_CAST);
if (Creature* pRandomDeadTrigger = Unit::GetCreature(*me, DeadTriggerGUID[rand() % POS_DEAD])) if (Creature* pRandomDeadTrigger = Unit::GetCreature(*me, DeadTriggerGUID[rand() % POS_DEAD]))
me->CastSpell(pRandomDeadTrigger, spellId, true); me->CastSpell(pRandomDeadTrigger, spellId, true);
} }
src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
+1 -1
View File
@@ -668,7 +668,7 @@ class npc_expedition_commander : public CreatureScript
break; break;
case 4: case 4:
for (uint8 n = 0; n < RAID_MODE(2, 4); n++) for (uint8 n = 0; n < RAID_MODE(2, 4); n++)
Engineer[n]->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USESTANDING); Engineer[n]->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING);
for (uint8 n = 0; n < 4; ++n) for (uint8 n = 0; n < 4; ++n)
Defender[n]->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_READY2H); Defender[n]->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_READY2H);
me->MonsterYell(SAY_AGGRO_2, LANG_UNIVERSAL, 0); me->MonsterYell(SAY_AGGRO_2, LANG_UNIVERSAL, 0);
src/server/scripts/Northrend/grizzly_hills.cpp
+1 -1
View File
@@ -415,7 +415,7 @@ public:
// call this each update tick? // call this each update tick?
if (me->FindNearestCreature(TALLHORN_STAG, 0.2f)) if (me->FindNearestCreature(TALLHORN_STAG, 0.2f))
{ {
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USESTANDING); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING);
} }
else else
if (m_uiPhase) if (m_uiPhase)
src/server/scripts/Outland/shadowmoon_valley.cpp
+1 -1
View File
@@ -117,7 +117,7 @@ public:
{ {
bIsEating = true; bIsEating = true;
EatTimer = 7000; EatTimer = 7000;
me->HandleEmoteCommand(EMOTE_ONESHOT_ATTACKUNARMED); me->HandleEmoteCommand(EMOTE_ONESHOT_ATTACK_UNARMED);
} }
} }