muffin v7.5.13
This commit is contained in:
parent
911ed68baa
commit
acf3e3cb18
69 changed files with 2731 additions and 1425 deletions
|
|
@ -80,14 +80,14 @@ internal static class Duty
|
|||
|
||||
private EDutyMode GetEffectiveEDutyMode(uint cfcId, EDutyMode? registryDutyMode)
|
||||
{
|
||||
if (registryDutyMode.HasValue)
|
||||
{
|
||||
return registryDutyMode.Value;
|
||||
}
|
||||
if (configuration.Duties.DutyModeOverrides.TryGetValue(cfcId, out var value))
|
||||
{
|
||||
return value;
|
||||
}
|
||||
if (registryDutyMode.HasValue)
|
||||
{
|
||||
return registryDutyMode.Value;
|
||||
}
|
||||
EDutyMode defaultDutyMode = configuration.Duties.DefaultDutyMode;
|
||||
if (defaultDutyMode == EDutyMode.Support && configuration.Duties.AutoUnsyncOverleveled && IsSafelyOverleveled(cfcId))
|
||||
{
|
||||
|
|
@ -380,7 +380,7 @@ internal static class Duty
|
|||
}
|
||||
}
|
||||
|
||||
internal sealed record EnableBossModForDutyTask : ITask
|
||||
internal sealed record EnableBossModForDutyTask(bool ActivateAi = true) : ITask
|
||||
{
|
||||
public override string ToString()
|
||||
{
|
||||
|
|
@ -392,7 +392,7 @@ internal static class Duty
|
|||
{
|
||||
protected override bool Start()
|
||||
{
|
||||
bossModIpc.EnableAi(BossModIpc.EPreset.Active);
|
||||
bossModIpc.EnableAi(BossModIpc.EPreset.Active, base.Task.ActivateAi);
|
||||
IPlayerCharacter localPlayer = objectTable.LocalPlayer;
|
||||
bool flag;
|
||||
if (localPlayer != null)
|
||||
|
|
@ -404,18 +404,18 @@ internal static class Duty
|
|||
if ((uint)(valueOrDefault - 3) <= 1u)
|
||||
{
|
||||
flag = true;
|
||||
goto IL_0077;
|
||||
goto IL_0082;
|
||||
}
|
||||
}
|
||||
flag = false;
|
||||
goto IL_0077;
|
||||
goto IL_0082;
|
||||
}
|
||||
goto IL_0087;
|
||||
IL_0077:
|
||||
goto IL_0092;
|
||||
IL_0082:
|
||||
bool isRanged = flag;
|
||||
bossModIpc.SetRangeStrategy(BossModIpc.EPreset.Active, isRanged);
|
||||
goto IL_0087;
|
||||
IL_0087:
|
||||
goto IL_0092;
|
||||
IL_0092:
|
||||
logger.LogDebug("Enabled BossMod Active preset for AutoDuty run");
|
||||
return true;
|
||||
}
|
||||
|
|
@ -463,7 +463,7 @@ internal static class Duty
|
|||
}
|
||||
}
|
||||
|
||||
internal sealed record EnableBossModPassiveForDutyTask : ITask
|
||||
internal sealed record EnableBossModPassiveForDutyTask(bool ActivateAi = true) : ITask
|
||||
{
|
||||
public override string ToString()
|
||||
{
|
||||
|
|
@ -475,7 +475,7 @@ internal static class Duty
|
|||
{
|
||||
protected override bool Start()
|
||||
{
|
||||
bossModIpc.EnableAi(BossModIpc.EPreset.Passive);
|
||||
bossModIpc.EnableAi(BossModIpc.EPreset.Passive, base.Task.ActivateAi);
|
||||
logger.LogDebug("Enabled BossMod Passive preset for AutoDuty run (hazard avoidance)");
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue