master #4

Merged
cacahuetes merged 75 commits from liza/Questionable:master into master 2024-09-02 21:50:11 +00:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit 0473c9b17c - Show all commits

View File

@ -99,7 +99,7 @@ internal sealed class ContextMenuController : IDisposable
if (agentSatisfactionSupply->IsAgentActive()) if (agentSatisfactionSupply->IsAgentActive())
{ {
int maxTurnIns = agentSatisfactionSupply->NpcInfo.SatisfactionRank == 1 ? 3 : 6; int maxTurnIns = agentSatisfactionSupply->NpcInfo.SatisfactionRank == 1 ? 3 : 6;
quantityToGather = Math.Min(agentSatisfactionSupply->RemainingAllowances, quantityToGather = Math.Min(agentSatisfactionSupply->NpcData.RemainingAllowances,
((AgentSatisfactionSupply2*)agentSatisfactionSupply)->CalculateTurnInsToNextRank(maxTurnIns)); ((AgentSatisfactionSupply2*)agentSatisfactionSupply)->CalculateTurnInsToNextRank(maxTurnIns));
} }
} }

View File

@ -44,7 +44,7 @@ internal static class TurnInDelivery
if (addon == null || !LAddon.IsAddonReady(addon)) if (addon == null || !LAddon.IsAddonReady(addon))
return ETaskResult.StillRunning; return ETaskResult.StillRunning;
ushort remainingAllowances = agentSatisfactionSupply->RemainingAllowances; ushort remainingAllowances = agentSatisfactionSupply->NpcData.RemainingAllowances;
if (remainingAllowances == 0) if (remainingAllowances == 0)
{ {
logger.LogInformation("No remaining weekly allowances"); logger.LogInformation("No remaining weekly allowances");