pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-22 12:18:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/global-base-scaling

Browse Source
This commit is contained in:
Chris Miles
2018-12-14 02:17:03 -06:00
committed by Chris Miles
parent f3067872c4 838ab5b77e
commit 9c1e14a4ab
24 changed files with 309 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/npc.cpp
+11 -3
View File
@@ -2611,7 +2611,16 @@ FACTION_VALUE NPC::CheckNPCFactionAlly(int32 other_faction) {
return FACTION_INDIFFERENT;
}
}
return FACTION_INDIFFERENT;
// I believe that the assumption is, barring no entry in npc_faction_entries
// that two npcs on like faction con ally to each other. This catches cases
// where an npc is on a faction but has no hits (hence no entry in
// npc_faction_entries).
if (GetPrimaryFaction() == other_faction)
return FACTION_ALLY;
else
return FACTION_INDIFFERENT;
}
bool NPC::IsFactionListAlly(uint32 other_faction) {
@@ -2801,7 +2810,6 @@ void NPC::ModifyStatsOnCharm(bool bRemoved)
CalcAC();
}
uint16 NPC::GetMeleeTexture1() const
{
return d_melee_texture1;
@@ -2840,4 +2848,4 @@ float NPC::GetProximityMinZ()
float NPC::GetProximityMaxZ()
{
return proximity->max_z;
}
}