mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9242] Fixed inconstence in one from recently added AI events name

Browse source
This commit is contained in:
VladimirMangos 2010-01-23 14:46:02 +03:00
parent 36d90d6040
commit 546ee35953
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/EventAI.txt
View file

@ -85,7 +85,7 @@ Some events such as EVENT_T_AGGRO, EVENT_T_DEATH, EVENT_T_SPAWNED, and EVENT_T_E
22 EVENT_T_RECEIVE_EMOTE EmoteId, Condition, CondValue1, CondValue2 Expires when a creature receives an emote with emote text id (enum TextEmotes) in (Param1). Conditions can be defined (Param2) with optional values (Param3,Param4), see enum ConditionType. 22 EVENT_T_RECEIVE_EMOTE EmoteId, Condition, CondValue1, CondValue2 Expires when a creature receives an emote with emote text id (enum TextEmotes) in (Param1). Conditions can be defined (Param2) with optional values (Param3,Param4), see enum ConditionType.
23 EVENT_T_BUFFED SpellID, AmmountInStack, RepeatMin, RepeatMax Expires when a creature has spell (Param1) auras applied in a stack greater or equal to value provided in (Param2). Will repeat every (Param3) and (Param4). 23 EVENT_T_BUFFED SpellID, AmmountInStack, RepeatMin, RepeatMax Expires when a creature has spell (Param1) auras applied in a stack greater or equal to value provided in (Param2). Will repeat every (Param3) and (Param4).
24 EVENT_T_TARGET_BUFFED SpellID, AmmountInStack, RepeatMin, RepeatMax Expires when a target unit has spell (Param1) auras applied in a stack greater or equal to value provided in (Param2). Will repeat every (Param3) and (Param4). 24 EVENT_T_TARGET_BUFFED SpellID, AmmountInStack, RepeatMin, RepeatMax Expires when a target unit has spell (Param1) auras applied in a stack greater or equal to value provided in (Param2). Will repeat every (Param3) and (Param4).
25 EVENT_T_SUMMONED_JUST_DIE CreatureId, RepeatMin, RepeatMax Expires after creature with entry = (Param1) is die (Param1 = 0 means all spawns). Will repeat every (Param2) and (Param3). 25 EVENT_T_SUMMONED_JUST_DIED CreatureId, RepeatMin, RepeatMax Expires after creature with entry = (Param1) is die (Param1 = 0 means all spawns). Will repeat every (Param2) and (Param3).
26 EVENT_T_SUMMONED_JUST_DESPAWN CreatureId, RepeatMin, RepeatMax Expires before creature with entry = (Param1) is despawn (Param1 = 0 means all spawns). Will repeat every (Param2) and (Param3). 26 EVENT_T_SUMMONED_JUST_DESPAWN CreatureId, RepeatMin, RepeatMax Expires before creature with entry = (Param1) is despawn (Param1 = 0 means all spawns). Will repeat every (Param2) and (Param3).
@ -384,7 +384,7 @@ CONDITION_QUESTTAKEN (9) quest_id 0, while quest active(incomplete)
CONDITION_ACTIVE_EVENT (12) event_id 0, note this is id from dbc, also defined in Mangos source(enum HolidayIds) NOT id of game_event in database CONDITION_ACTIVE_EVENT (12) event_id 0, note this is id from dbc, also defined in Mangos source(enum HolidayIds) NOT id of game_event in database
--------------------------- ---------------------------
25 = EVENT_T_SUMMONED_JUST_DIE: 25 = EVENT_T_SUMMONED_JUST_DIED:
--------------------------- ---------------------------
Parameter 1: CreatureId - The CreatureID that the NPC is watching die to trigger this event Parameter 1: CreatureId - The CreatureID that the NPC is watching die to trigger this event
Parameter 2: RepeatMin - Minimum Time used to calculate Random Repeat Expire Parameter 2: RepeatMin - Minimum Time used to calculate Random Repeat Expire

2
src/game/CreatureAI.h
View file

@ -96,7 +96,7 @@ class MANGOS_DLL_SPEC CreatureAI
virtual void JustDied(Unit *) {} virtual void JustDied(Unit *) {}
// Called when the creature summon is killed // Called when the creature summon is killed
virtual void SummonedCreatureJustDie(Creature* /*unit*/) {} virtual void SummonedCreatureJustDied(Creature* /*unit*/) {}
// Called when the creature kills a unit // Called when the creature kills a unit
virtual void KilledUnit(Unit *) {} virtual void KilledUnit(Unit *) {}

6
src/game/CreatureEventAI.cpp
View file

@ -257,7 +257,7 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
break; break;
} }
case EVENT_T_SUMMONED_UNIT: case EVENT_T_SUMMONED_UNIT:
case EVENT_T_SUMMONED_JUST_DIE: case EVENT_T_SUMMONED_JUST_DIED:
case EVENT_T_SUMMONED_JUST_DESPAWN: case EVENT_T_SUMMONED_JUST_DESPAWN:
{ {
//Prevent event from occuring on no unit or non creatures //Prevent event from occuring on no unit or non creatures
@ -913,14 +913,14 @@ void CreatureEventAI::JustSummoned(Creature* pUnit)
} }
} }
void CreatureEventAI::SummonedCreatureJustDie(Creature* pUnit) void CreatureEventAI::SummonedCreatureJustDied(Creature* pUnit)
{ {
if (bEmptyList || !pUnit) if (bEmptyList || !pUnit)
return; return;
for (std::list<CreatureEventAIHolder>::iterator i = CreatureEventAIList.begin(); i != CreatureEventAIList.end(); ++i) for (std::list<CreatureEventAIHolder>::iterator i = CreatureEventAIList.begin(); i != CreatureEventAIList.end(); ++i)
{ {
if ((*i).Event.event_type == EVENT_T_SUMMONED_JUST_DIE) if ((*i).Event.event_type == EVENT_T_SUMMONED_JUST_DIED)
ProcessEvent(*i, pUnit); ProcessEvent(*i, pUnit);
} }
} }

6
src/game/CreatureEventAI.h
View file

@ -58,7 +58,7 @@ enum EventAI_Type
EVENT_T_RECEIVE_EMOTE = 22, // EmoteId, Condition, CondValue1, CondValue2 EVENT_T_RECEIVE_EMOTE = 22, // EmoteId, Condition, CondValue1, CondValue2
EVENT_T_BUFFED = 23, // Param1 = SpellID, Param2 = Number of Time STacked, Param3/4 Repeat Min/Max EVENT_T_BUFFED = 23, // Param1 = SpellID, Param2 = Number of Time STacked, Param3/4 Repeat Min/Max
EVENT_T_TARGET_BUFFED = 24, // Param1 = SpellID, Param2 = Number of Time STacked, Param3/4 Repeat Min/Max EVENT_T_TARGET_BUFFED = 24, // Param1 = SpellID, Param2 = Number of Time STacked, Param3/4 Repeat Min/Max
EVENT_T_SUMMONED_JUST_DIE = 25, // CreatureId, RepeatMin, RepeatMax EVENT_T_SUMMONED_JUST_DIED = 25, // CreatureId, RepeatMin, RepeatMax
EVENT_T_SUMMONED_JUST_DESPAWN = 26, // CreatureId, RepeatMin, RepeatMax EVENT_T_SUMMONED_JUST_DESPAWN = 26, // CreatureId, RepeatMin, RepeatMax
EVENT_T_END, EVENT_T_END,
@ -488,7 +488,7 @@ struct CreatureEventAI_Event
uint32 repeatMax; uint32 repeatMax;
} friendly_buff; } friendly_buff;
// EVENT_T_SUMMONED_UNIT = 17 // EVENT_T_SUMMONED_UNIT = 17
//EVENT_T_SUMMONED_JUST_DIE = 25 //EVENT_T_SUMMONED_JUST_DIED = 25
//EVENT_T_SUMMONED_JUST_DESPAWN = 26 //EVENT_T_SUMMONED_JUST_DESPAWN = 26
struct struct
{ {
@ -586,7 +586,7 @@ class MANGOS_DLL_SPEC CreatureEventAI : public CreatureAI
void UpdateAI(const uint32 diff); void UpdateAI(const uint32 diff);
bool IsVisible(Unit *) const; bool IsVisible(Unit *) const;
void ReceiveEmote(Player* pPlayer, uint32 text_emote); void ReceiveEmote(Player* pPlayer, uint32 text_emote);
void SummonedCreatureJustDie(Creature* unit); void SummonedCreatureJustDied(Creature* unit);
void SummonedCreatureDespawn(Creature* unit); void SummonedCreatureDespawn(Creature* unit);
static int Permissible(const Creature *); static int Permissible(const Creature *);

2
src/game/CreatureEventAIMgr.cpp
View file

@ -404,7 +404,7 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
sLog.outErrorDb("CreatureEventAI: Creature %u are using event(%u) with param2 < param1 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i); sLog.outErrorDb("CreatureEventAI: Creature %u are using event(%u) with param2 < param1 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
break; break;
case EVENT_T_SUMMONED_UNIT: case EVENT_T_SUMMONED_UNIT:
case EVENT_T_SUMMONED_JUST_DIE: case EVENT_T_SUMMONED_JUST_DIED:
case EVENT_T_SUMMONED_JUST_DESPAWN: case EVENT_T_SUMMONED_JUST_DESPAWN:
if (!sCreatureStorage.LookupEntry<CreatureInfo>(temp.summoned.creatureId)) if (!sCreatureStorage.LookupEntry<CreatureInfo>(temp.summoned.creatureId))
sLog.outErrorDb("CreatureEventAI: Creature %u are using event(%u) with not existed creature template id (%u) in param1, skipped.", temp.creature_id, i, temp.summoned.creatureId); sLog.outErrorDb("CreatureEventAI: Creature %u are using event(%u) with not existed creature template id (%u) in param1, skipped.", temp.creature_id, i, temp.summoned.creatureId);

2
src/game/Unit.cpp
View file

@ -691,7 +691,7 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
if (IS_CREATURE_GUID(pSummon->GetSummonerGUID())) if (IS_CREATURE_GUID(pSummon->GetSummonerGUID()))
if(Creature* pSummoner = cVictim->GetMap()->GetCreature(pSummon->GetSummonerGUID())) if(Creature* pSummoner = cVictim->GetMap()->GetCreature(pSummon->GetSummonerGUID()))
if (pSummoner->AI()) if (pSummoner->AI())
pSummoner->AI()->SummonedCreatureJustDie(cVictim); pSummoner->AI()->SummonedCreatureJustDied(cVictim);
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9241" #define REVISION_NR "9242"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__