mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 13:37:05 +00:00
[10296] Move ChooseDisplayId to Creature class for access from script side
Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
parent
181428e132
commit
7bdf05901d
8 changed files with 62 additions and 60 deletions
|
|
@ -902,57 +902,6 @@ CreatureModelInfo const* ObjectMgr::GetCreatureModelInfo(uint32 modelid)
|
|||
return sCreatureModelStorage.LookupEntry<CreatureModelInfo>(modelid);
|
||||
}
|
||||
|
||||
uint32 ObjectMgr::ChooseDisplayId(uint32 team, const CreatureInfo *cinfo, const CreatureData *data /*= NULL*/)
|
||||
{
|
||||
// Use creature model explicit, override template (creature.modelid)
|
||||
if (data && data->modelid_override)
|
||||
return data->modelid_override;
|
||||
|
||||
// use defaults from the template
|
||||
uint32 display_id = 0;
|
||||
|
||||
// models may be categorized as (in this order):
|
||||
// if mod4 && mod3 && mod2 && mod1 use any, by 25%-chance (other gender is selected and replaced after this function)
|
||||
// if mod3 && mod2 && mod1 use mod3 unless mod2 has modelid_alt_model (then all by 33%-chance)
|
||||
// if mod2 use mod2 unless mod2 has modelid_alt_model (then both by 50%-chance)
|
||||
// if mod1 use mod1
|
||||
|
||||
// model selected here may be replaced with other_gender using own function
|
||||
|
||||
if (cinfo->ModelId[3] && cinfo->ModelId[2] && cinfo->ModelId[1] && cinfo->ModelId[0])
|
||||
{
|
||||
display_id = cinfo->ModelId[urand(0,3)];
|
||||
}
|
||||
else if (cinfo->ModelId[2] && cinfo->ModelId[1] && cinfo->ModelId[0])
|
||||
{
|
||||
uint32 modelid_tmp = GetCreatureModelAlternativeModel(cinfo->ModelId[1]);
|
||||
display_id = modelid_tmp ? cinfo->ModelId[urand(0,2)] : cinfo->ModelId[2];
|
||||
}
|
||||
else if (cinfo->ModelId[1])
|
||||
{
|
||||
// We use this to eliminate invisible models vs. "dummy" models (infernals, etc).
|
||||
// Where it's expected to select one of two, model must have a alternative model defined (alternative model is normally the same as defined in ModelId1).
|
||||
// Same pattern is used in the above model selection, but the result may be ModelId3 and not ModelId2 as here.
|
||||
uint32 modelid_tmp = GetCreatureModelAlternativeModel(cinfo->ModelId[1]);
|
||||
display_id = modelid_tmp ? modelid_tmp : cinfo->ModelId[1];
|
||||
}
|
||||
else if (cinfo->ModelId[0])
|
||||
{
|
||||
display_id = cinfo->ModelId[0];
|
||||
}
|
||||
|
||||
// fail safe, we use creature entry 1 and make error
|
||||
if (!display_id)
|
||||
{
|
||||
sLog.outErrorDb("Call customer support, ChooseDisplayId can not select native model for creature entry %u, model from creature entry 1 will be used instead.", cinfo->Entry);
|
||||
|
||||
if (const CreatureInfo *creatureDefault = GetCreatureTemplate(1))
|
||||
display_id = creatureDefault->ModelId[0];
|
||||
}
|
||||
|
||||
return display_id;
|
||||
}
|
||||
|
||||
// generally models that does not have a gender(2), or has alternative model for same gender
|
||||
uint32 ObjectMgr::GetCreatureModelAlternativeModel(uint32 modelId)
|
||||
{
|
||||
|
|
@ -5383,7 +5332,7 @@ uint32 ObjectMgr::GetTaxiMountDisplayId( uint32 id, uint32 team, bool allowed_al
|
|||
if (!mount_info)
|
||||
return 0;
|
||||
|
||||
uint16 mount_id = ChooseDisplayId(team,mount_info);
|
||||
uint16 mount_id = Creature::ChooseDisplayId(team,mount_info);
|
||||
if (!mount_id)
|
||||
return 0;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue