master #3

Open
cacahuetes wants to merge 640 commits from liza/Questionable:master into cacahuetes-ShB-Healer
Showing only changes of commit ca4bc07eeb - Show all commits

View File

@ -431,7 +431,8 @@ internal sealed unsafe class GameFunctions
if (!AgentSatisfactionSupply.Instance()->IsAgentActive()) if (!AgentSatisfactionSupply.Instance()->IsAgentActive())
return false; return false;
var flags = _condition.AsReadOnlySet(); var flags = _condition.AsReadOnlySet().ToHashSet();
flags.Remove(ConditionFlag.InDutyQueue); // irrelevant
return flags.Count == 2 && return flags.Count == 2 &&
flags.Contains(ConditionFlag.NormalConditions) && flags.Contains(ConditionFlag.NormalConditions) &&
flags.Contains(ConditionFlag.OccupiedInQuestEvent); flags.Contains(ConditionFlag.OccupiedInQuestEvent);