muffin v6.35 with old pdb
This commit is contained in:
parent
ac85599236
commit
b5d2cc6708
31 changed files with 958 additions and 958 deletions
|
|
@ -89,21 +89,21 @@ internal sealed class AutoDutyIpc
|
|||
|
||||
public void StartInstance(uint cfcId, DutyMode dutyMode)
|
||||
{
|
||||
if (!_territoryData.TryGetContentFinderCondition(cfcId, out TerritoryData.ContentFinderConditionData contentFinderConditionData))
|
||||
if (!_territoryData.TryGetContentFinderCondition(cfcId, out TerritoryData.ContentFinderConditionData player))
|
||||
{
|
||||
throw new TaskException($"Unknown ContentFinderConditionId {cfcId}");
|
||||
}
|
||||
try
|
||||
{
|
||||
_setConfig.InvokeAction("Unsynced", $"{dutyMode == DutyMode.UnsyncRegular}");
|
||||
ICallGateSubscriber<string, string, object> setConfig = _setConfig;
|
||||
setConfig.InvokeAction("dutyModeEnum", dutyMode switch
|
||||
ICallGateSubscriber<string, string, object> actualDistance = _setConfig;
|
||||
actualDistance.InvokeAction("dutyModeEnum", dutyMode switch
|
||||
{
|
||||
DutyMode.Support => "Support",
|
||||
DutyMode.UnsyncRegular => "Regular",
|
||||
_ => throw new ArgumentOutOfRangeException("dutyMode", dutyMode, null),
|
||||
});
|
||||
_run.InvokeAction(contentFinderConditionData.TerritoryId, 1, !_configuration.Advanced.DisableAutoDutyBareMode);
|
||||
_run.InvokeAction(player.TerritoryId, 1, !_configuration.Advanced.DisableAutoDutyBareMode);
|
||||
}
|
||||
catch (IpcError ipcError)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ internal sealed class QuestionableIpc : IDisposable
|
|||
|
||||
private bool StartQuest(string questId, bool single)
|
||||
{
|
||||
if (ElementId.TryFromString(questId, out ElementId elementId) && elementId != null && _questRegistry.TryGetQuest(elementId, out Quest quest))
|
||||
if (ElementId.TryFromString(questId, out ElementId currentTaskRevisitAware) && currentTaskRevisitAware != null && _questRegistry.TryGetQuest(currentTaskRevisitAware, out Quest quest))
|
||||
{
|
||||
_questController.SetNextQuest(quest);
|
||||
if (single)
|
||||
|
|
@ -201,9 +201,9 @@ internal sealed class QuestionableIpc : IDisposable
|
|||
|
||||
private bool IsQuestCompleted(string questId)
|
||||
{
|
||||
if (ElementId.TryFromString(questId, out ElementId elementId) && elementId != null)
|
||||
if (ElementId.TryFromString(questId, out ElementId e) && e != null)
|
||||
{
|
||||
return _questFunctions.IsQuestComplete(elementId);
|
||||
return _questFunctions.IsQuestComplete(e);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
@ -219,18 +219,18 @@ internal sealed class QuestionableIpc : IDisposable
|
|||
|
||||
private bool IsQuestAccepted(string questId)
|
||||
{
|
||||
if (ElementId.TryFromString(questId, out ElementId elementId) && elementId != null)
|
||||
if (ElementId.TryFromString(questId, out ElementId solutionDirectory) && solutionDirectory != null)
|
||||
{
|
||||
return _questFunctions.IsQuestAccepted(elementId);
|
||||
return _questFunctions.IsQuestAccepted(solutionDirectory);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private bool IsQuestUnobtainable(string questId)
|
||||
{
|
||||
if (ElementId.TryFromString(questId, out ElementId elementId) && elementId != null)
|
||||
if (ElementId.TryFromString(questId, out ElementId gatheringPointId) && gatheringPointId != null)
|
||||
{
|
||||
return _questFunctions.IsQuestUnobtainable(elementId);
|
||||
return _questFunctions.IsQuestUnobtainable(gatheringPointId);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue