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

*Try to fix the bug that pets do not have correct AI.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-11 15:59:27 -05:00
parent b2fa2fb797
commit 06a8f2a7d1
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/CreatureAISelector.cpp
+13 -22
View File
@@ -35,24 +35,24 @@ namespace FactorySelector
{ {
CreatureAI* selectAI(Creature *creature) CreatureAI* selectAI(Creature *creature)
{ {
//if(creature->isPossessed()) const CreatureAICreator *ai_factory = NULL;
// creature->InitPossessedAI(); CreatureAIRegistry &ai_registry(CreatureAIRepository::Instance());
// Allow scripting AI for normal creatures and not controlled pets (guardians and mini-pets) //player-controlled guardians with pet bar
if((!creature->isPet() || !((Pet*)creature)->isControlled()) && !creature->isCharmed()) if(creature->HasSummonMask(SUMMON_MASK_GUARDIAN) && ((Guardian*)creature)->GetOwner()->GetTypeId() == TYPEID_PLAYER)
ai_factory = ai_registry.GetRegistryItem("PetAI");
//scriptname in db
if(!ai_factory)
if(CreatureAI* scriptedAI = Script->GetAI(creature)) if(CreatureAI* scriptedAI = Script->GetAI(creature))
return scriptedAI; return scriptedAI;
CreatureAIRegistry &ai_registry(CreatureAIRepository::Instance()); CreatureInfo const *cinfo = creature->GetCreatureInfo();
assert( creature->GetCreatureInfo() != NULL ); assert(cinfo);
CreatureInfo const *cinfo=creature->GetCreatureInfo();
const CreatureAICreator *ai_factory = NULL;
// this seems to be useless
std::string ainame=cinfo->AIName; std::string ainame=cinfo->AIName;
if(!ai_factory && !ainame.empty())
// select by script name
if( !ainame.empty())
ai_factory = ai_registry.GetRegistryItem( ainame.c_str() ); ai_factory = ai_registry.GetRegistryItem( ainame.c_str() );
// select by NPC flags // select by NPC flags
@@ -60,21 +60,12 @@ namespace FactorySelector
{ {
if( creature->isGuard() ) if( creature->isGuard() )
ai_factory = ai_registry.GetRegistryItem("GuardAI"); ai_factory = ai_registry.GetRegistryItem("GuardAI");
else if(creature->isPet() || (creature->isCharmed() && !creature->isPossessed())) else if(creature->HasSummonMask(SUMMON_MASK_GUARDIAN))
ai_factory = ai_registry.GetRegistryItem("PetAI"); ai_factory = ai_registry.GetRegistryItem("PetAI");
else if(creature->isTotem()) else if(creature->isTotem())
ai_factory = ai_registry.GetRegistryItem("TotemAI"); ai_factory = ai_registry.GetRegistryItem("TotemAI");
else if(creature->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_TRIGGER) else if(creature->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_TRIGGER)
ai_factory = ai_registry.GetRegistryItem("NullCreatureAI"); ai_factory = ai_registry.GetRegistryItem("NullCreatureAI");
else if(creature->isSummon() && ((TempSummon*)creature)->m_Properties)
{
if(((TempSummon*)creature)->m_Properties->Category == SUMMON_CATEGORY_PET
|| ((TempSummon*)creature)->m_Properties->Type == SUMMON_TYPE_GUARDIAN
|| ((TempSummon*)creature)->m_Properties->Type == SUMMON_TYPE_MINION)
ai_factory = ai_registry.GetRegistryItem("PetAI");
else if(((TempSummon*)creature)->m_Properties->Type == SUMMON_TYPE_MINIPET)
ai_factory = ai_registry.GetRegistryItem("CritterAI");
}
else if(creature->GetCreatureType() == CREATURE_TYPE_CRITTER) else if(creature->GetCreatureType() == CREATURE_TYPE_CRITTER)
ai_factory = ai_registry.GetRegistryItem("CritterAI"); ai_factory = ai_registry.GetRegistryItem("CritterAI");
} }