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

*Merge

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-08-11 22:42:41 -07:00
parent 941fd64a24 f0c8efea55
commit ab0049fd33
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp
+10 -12
View File
@@ -18,6 +18,7 @@
#include "precompiled.h" #include "precompiled.h"
#include "Vehicle.h" #include "Vehicle.h"
#include "ObjectMgr.h"
#define GCD_CAST 1 #define GCD_CAST 1
@@ -549,11 +550,13 @@ struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI
{ {
npc_unworthy_initiateAI(Creature *c) : ScriptedAI(c) npc_unworthy_initiateAI(Creature *c) : ScriptedAI(c)
{ {
m_creature->GetHomePosition(home_x,home_y,home_z,home_ori);
me->SetReactState(REACT_PASSIVE); me->SetReactState(REACT_PASSIVE);
if(!me->GetEquipmentId())
if(const CreatureInfo *info = GetCreatureInfo(28406))
if(info->equipmentId)
const_cast<CreatureInfo*>(me->GetCreatureInfo())->equipmentId = info->equipmentId;
} }
float home_x,home_y,home_z,home_ori;
bool event_startet; bool event_startet;
uint64 event_starter; uint64 event_starter;
initiate_phase phase; initiate_phase phase;
@@ -571,12 +574,8 @@ struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI
m_creature->setFaction(7); m_creature->setFaction(7);
m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 8); m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 8);
m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID , 0); me->LoadEquipment(0, true);
m_creature->SetDisplayId(m_creature->GetNativeDisplayId());
event_starter = 0;
event_startet = false; event_startet = false;
m_creature->SetHomePosition(home_x,home_y,home_z,home_ori);
m_creature->GetMotionMaster()->MoveTargetedHome();
} }
void EnterCombat(Unit *who) void EnterCombat(Unit *who)
@@ -617,15 +616,14 @@ struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI
phase = ToEquipping; phase = ToEquipping;
m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
anchor->GetNearPoint2D(targ_x,targ_y,1,anchor->GetAngle(m_creature));
//anchor->DealDamage(anchor,anchor->GetHealth());
m_creature->RemoveAurasDueToSpell(SPELL_SOUL_PRISON_CHAIN_SELF); m_creature->RemoveAurasDueToSpell(SPELL_SOUL_PRISON_CHAIN_SELF);
m_creature->RemoveAurasDueToSpell(SPELL_SOUL_PRISON_CHAIN); m_creature->RemoveAurasDueToSpell(SPELL_SOUL_PRISON_CHAIN);
float z;
anchor->GetContactPoint(me, targ_x, targ_y, z, 1.0f);
event_starter = target->GetGUID(); event_starter = target->GetGUID();
if(Unit* starter = Unit::GetUnit((*m_creature),event_starter)) DoScriptText(say_event_start[rand()%8], m_creature, target);
DoScriptText(say_event_start[rand()%8],m_creature,starter);
} }
void UpdateAI(const uint32 diff); void UpdateAI(const uint32 diff);
src/game/Creature.h
+1 -1
View File
@@ -500,7 +500,7 @@ class TRINITY_DLL_SPEC Creature : public Unit
void Update( uint32 time ); // overwrited Unit::Update void Update( uint32 time ); // overwrited Unit::Update
void GetRespawnCoord(float &x, float &y, float &z, float* ori = NULL, float* dist =NULL) const; void GetRespawnCoord(float &x, float &y, float &z, float* ori = NULL, float* dist =NULL) const;
uint32 GetEquipmentId() const { return m_equipmentId; } uint32 GetEquipmentId() const { return GetCreatureInfo()->equipmentId; }
uint32 HasSummonMask(uint32 mask) const { return mask & m_summonMask; } uint32 HasSummonMask(uint32 mask) const { return mask & m_summonMask; }
bool isSummon() const { return m_summonMask & SUMMON_MASK_SUMMON; } bool isSummon() const { return m_summonMask & SUMMON_MASK_SUMMON; }