erdelf/qstbak
1
0
Fork 0
forked from aly/qstbak
Code Pull requests Activity

muffin v7.5.0

Browse source
This commit is contained in:
alydev 2026-05-01 05:17:35 +10:00
parent afafd5e377
commit a6481e7b9a
67 changed files with 4281 additions and 2372 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Questionable/Questionable.Controller.Steps.Shared/AethernetShortcut.cs
View file

@ -70,7 +70,7 @@ internal static class AethernetShortcut
logger.LogInformation("Skipping aethernet shortcut because the target is in the same territory");
return false;
}
if (base.Task.SkipConditions.InTerritory.Contains(clientState.TerritoryType))
if (base.Task.SkipConditions.InTerritory.Contains((ushort)clientState.TerritoryType))
{
logger.LogInformation("Skipping aethernet shortcut because the target is in the specified territory");
return false;
@ -98,7 +98,7 @@ internal static class AethernetShortcut
}
if (aetheryteFunctions.IsAetheryteUnlocked(base.Task.From) && aetheryteFunctions.IsAetheryteUnlocked(base.Task.To))
{
ushort territoryType = clientState.TerritoryType;
uint territoryType = clientState.TerritoryType;
IGameObject gameObject = objectTable[0];
if (gameObject == null)
{

4
Questionable/Questionable.Controller.Steps.Shared/AetheryteShortcut.cs
View file

@ -77,13 +77,13 @@ internal static class AetheryteShortcut
private bool ShouldSkipTeleport()
{
ushort territoryType = clientState.TerritoryType;
uint territoryType = clientState.TerritoryType;
if (base.Task.Step != null)
{
SkipAetheryteCondition skipAetheryteCondition = base.Task.Step.SkipConditions?.AetheryteShortcutIf ?? new SkipAetheryteCondition();
if (skipAetheryteCondition != null && !skipAetheryteCondition.Never)
{
if (skipAetheryteCondition.InTerritory.Contains(territoryType))
if (skipAetheryteCondition.InTerritory.Contains((ushort)territoryType))
{
logger.LogInformation("Skipping aetheryte teleport due to SkipCondition (InTerritory)");
return true;

2
Questionable/Questionable.Controller.Steps.Shared/ExtraConditionUtils.cs
View file

@ -27,7 +27,7 @@ internal sealed class ExtraConditionUtils
return false;
}
public static bool MatchesExtraCondition(EExtraSkipCondition skipCondition, Vector3 position, ushort territoryType)
public static bool MatchesExtraCondition(EExtraSkipCondition skipCondition, Vector3 position, uint territoryType)
{
return skipCondition switch
{

4
Questionable/Questionable.Controller.Steps.Shared/SkipCondition.cs
View file

@ -157,12 +157,12 @@ internal static class SkipCondition
private bool CheckTerritoryCondition(SkipStepConditions skipConditions)
{
if (skipConditions.InTerritory.Count > 0 && skipConditions.InTerritory.Contains(clientState.TerritoryType))
if (skipConditions.InTerritory.Count > 0 && skipConditions.InTerritory.Contains((ushort)clientState.TerritoryType))
{
logger.LogInformation("Skipping step, as in a skip.InTerritory");
return true;
}
if (skipConditions.NotInTerritory.Count > 0 && !skipConditions.NotInTerritory.Contains(clientState.TerritoryType))
if (skipConditions.NotInTerritory.Count > 0 && !skipConditions.NotInTerritory.Contains((ushort)clientState.TerritoryType))
{
logger.LogInformation("Skipping step, as not in a skip.NotInTerritory");
return true;