|
|
@ -1319,22 +1319,6 @@ bool CCharacter::checkPreRequired(const CGameItemPtr & item, bool equipCheck )
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pair<PVP_CLAN::TPVPClan, PVP_CLAN::TPVPClan> allegeance = getAllegiance();
|
|
|
|
|
|
|
|
bool neutralcult = (allegeance.first == PVP_CLAN::Neutral || allegeance.first == PVP_CLAN::None);
|
|
|
|
|
|
|
|
bool neutralciv = (allegeance.second == PVP_CLAN::Neutral || allegeance.second == PVP_CLAN::None);
|
|
|
|
|
|
|
|
if (item->getPhraseId().find("foragetool_") != 0 && (
|
|
|
|
|
|
|
|
(item->getRequiredFaction() == "kami" && (allegeance.first != PVP_CLAN::Kami || getOrganization() != 0)) ||
|
|
|
|
|
|
|
|
(item->getRequiredFaction() == "karavan" && (allegeance.first != PVP_CLAN::Karavan || getOrganization() != 0)) ||
|
|
|
|
|
|
|
|
(item->getRequiredFaction() == "marauder" && (!neutralcult || !neutralciv || getOrganization() != 5)) ||
|
|
|
|
|
|
|
|
(item->getRequiredFaction() == "neutralcult" && (!neutralcult || getOrganization() != 0)) ||
|
|
|
|
|
|
|
|
(item->getRequiredFaction() == "neutralciv" && (!neutralciv || getOrganization() != 0)) ||
|
|
|
|
|
|
|
|
(item->getRequiredFaction() == "neutral" && (!neutralcult || !neutralciv || getOrganization() != 0)) ||
|
|
|
|
|
|
|
|
(item->getRequiredFaction() == "fyros" && (allegeance.second != PVP_CLAN::Fyros || getOrganization() != 0)) ||
|
|
|
|
|
|
|
|
(item->getRequiredFaction() == "matis" && (allegeance.second != PVP_CLAN::Matis || getOrganization() != 0)) ||
|
|
|
|
|
|
|
|
(item->getRequiredFaction() == "tryker" && (allegeance.second != PVP_CLAN::Tryker || getOrganization() != 0)) ||
|
|
|
|
|
|
|
|
(item->getRequiredFaction() == "zorai" && (allegeance.second != PVP_CLAN::Zorai || getOrganization() != 0))))
|
|
|
|
|
|
|
|
requiredRespected = false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if( requiredRespected == false && equipCheck )
|
|
|
|
if( requiredRespected == false && equipCheck )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
PHRASE_UTILITIES::sendDynamicSystemMessage( _EntityRowId, "REQUIRED_EQUIP" );
|
|
|
|
PHRASE_UTILITIES::sendDynamicSystemMessage( _EntityRowId, "REQUIRED_EQUIP" );
|
|
|
|