aly/qstbak
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

muffin v6.15

Browse source
This commit is contained in:
alydev 2025-10-09 08:41:52 +10:00
parent 344451fa8e
commit 7413877064
21 changed files with 131 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

6
GatheringPaths/Properties/AssemblyInfo.cs
View file

@ -5,11 +5,11 @@ using System.Runtime.Versioning;
[assembly: AssemblyCompany("GatheringPaths")] [assembly: AssemblyCompany("GatheringPaths")]
[assembly: AssemblyConfiguration("Release")] [assembly: AssemblyConfiguration("Release")]
[assembly: AssemblyFileVersion("6.14.0.0")] [assembly: AssemblyFileVersion("6.15.0.0")]
[assembly: AssemblyInformationalVersion("6.14+47775848820b6b7dabd835e0661a48b7791f01c8")] [assembly: AssemblyInformationalVersion("6.15+fa9d726e067f739fff28fea7966f665e8dcfde88")]
[assembly: AssemblyProduct("GatheringPaths")] [assembly: AssemblyProduct("GatheringPaths")]
[assembly: AssemblyTitle("GatheringPaths")] [assembly: AssemblyTitle("GatheringPaths")]
[assembly: TargetPlatform("Windows7.0")] [assembly: TargetPlatform("Windows7.0")]
[assembly: SupportedOSPlatform("Windows7.0")] [assembly: SupportedOSPlatform("Windows7.0")]
[assembly: AssemblyVersion("6.14.0.0")] [assembly: AssemblyVersion("6.15.0.0")]
[module: RefSafetyRules(11)] [module: RefSafetyRules(11)]

6
LLib/Properties/AssemblyInfo.cs
View file

@ -7,12 +7,12 @@ using System.Security.Permissions;
[assembly: AssemblyCompany("LLib")] [assembly: AssemblyCompany("LLib")]
[assembly: AssemblyConfiguration("Release")] [assembly: AssemblyConfiguration("Release")]
[assembly: AssemblyFileVersion("6.14.0.0")] [assembly: AssemblyFileVersion("6.15.0.0")]
[assembly: AssemblyInformationalVersion("6.14+5367edf45faba59401605531555000d1429966c1")] [assembly: AssemblyInformationalVersion("6.15+5367edf45faba59401605531555000d1429966c1")]
[assembly: AssemblyProduct("LLib")] [assembly: AssemblyProduct("LLib")]
[assembly: AssemblyTitle("LLib")] [assembly: AssemblyTitle("LLib")]
[assembly: AssemblyMetadata("RepositoryUrl", "https://github.com/WigglyMuffin/LLib.git")] [assembly: AssemblyMetadata("RepositoryUrl", "https://github.com/WigglyMuffin/LLib.git")]
[assembly: TargetPlatform("Windows7.0")] [assembly: TargetPlatform("Windows7.0")]
[assembly: SupportedOSPlatform("Windows7.0")] [assembly: SupportedOSPlatform("Windows7.0")]
[assembly: AssemblyVersion("6.14.0.0")] [assembly: AssemblyVersion("6.15.0.0")]
[module: RefSafetyRules(11)] [module: RefSafetyRules(11)]

6
QuestPaths/Properties/AssemblyInfo.cs
View file

@ -5,9 +5,9 @@ using System.Runtime.Versioning;
[assembly: AssemblyCompany("QuestPaths")] [assembly: AssemblyCompany("QuestPaths")]
[assembly: AssemblyConfiguration("Release")] [assembly: AssemblyConfiguration("Release")]
[assembly: AssemblyFileVersion("6.14.0.0")] [assembly: AssemblyFileVersion("6.15.0.0")]
[assembly: AssemblyInformationalVersion("6.14+47775848820b6b7dabd835e0661a48b7791f01c8")] [assembly: AssemblyInformationalVersion("6.15+fa9d726e067f739fff28fea7966f665e8dcfde88")]
[assembly: AssemblyProduct("QuestPaths")] [assembly: AssemblyProduct("QuestPaths")]
[assembly: AssemblyTitle("QuestPaths")] [assembly: AssemblyTitle("QuestPaths")]
[assembly: AssemblyVersion("6.14.0.0")] [assembly: AssemblyVersion("6.15.0.0")]
[module: RefSafetyRules(11)] [module: RefSafetyRules(11)]

6
Questionable.Model/Properties/AssemblyInfo.cs
View file

@ -5,9 +5,9 @@ using System.Runtime.Versioning;
[assembly: AssemblyCompany("Questionable.Model")] [assembly: AssemblyCompany("Questionable.Model")]
[assembly: AssemblyConfiguration("Release")] [assembly: AssemblyConfiguration("Release")]
[assembly: AssemblyFileVersion("6.14.0.0")] [assembly: AssemblyFileVersion("6.15.0.0")]
[assembly: AssemblyInformationalVersion("6.14+47775848820b6b7dabd835e0661a48b7791f01c8")] [assembly: AssemblyInformationalVersion("6.15+fa9d726e067f739fff28fea7966f665e8dcfde88")]
[assembly: AssemblyProduct("Questionable.Model")] [assembly: AssemblyProduct("Questionable.Model")]
[assembly: AssemblyTitle("Questionable.Model")] [assembly: AssemblyTitle("Questionable.Model")]
[assembly: AssemblyVersion("6.14.0.0")] [assembly: AssemblyVersion("6.15.0.0")]
[module: RefSafetyRules(11)] [module: RefSafetyRules(11)]

6
Questionable/Properties/AssemblyInfo.cs
View file

@ -7,12 +7,12 @@ using System.Security.Permissions;
[assembly: AssemblyCompany("Questionable")] [assembly: AssemblyCompany("Questionable")]
[assembly: AssemblyConfiguration("Release")] [assembly: AssemblyConfiguration("Release")]
[assembly: AssemblyFileVersion("6.14.0.0")] [assembly: AssemblyFileVersion("6.15.0.0")]
[assembly: AssemblyInformationalVersion("6.14+47775848820b6b7dabd835e0661a48b7791f01c8")] [assembly: AssemblyInformationalVersion("6.15+fa9d726e067f739fff28fea7966f665e8dcfde88")]
[assembly: AssemblyProduct("Questionable")] [assembly: AssemblyProduct("Questionable")]
[assembly: AssemblyTitle("Questionable")] [assembly: AssemblyTitle("Questionable")]
[assembly: AssemblyMetadata("RepositoryUrl", "https://github.com/WigglyMuffin/Ambivalence")] [assembly: AssemblyMetadata("RepositoryUrl", "https://github.com/WigglyMuffin/Ambivalence")]
[assembly: TargetPlatform("Windows7.0")] [assembly: TargetPlatform("Windows7.0")]
[assembly: SupportedOSPlatform("Windows7.0")] [assembly: SupportedOSPlatform("Windows7.0")]
[assembly: AssemblyVersion("6.14.0.0")] [assembly: AssemblyVersion("6.15.0.0")]
[module: RefSafetyRules(11)] [module: RefSafetyRules(11)]

2
Questionable/Questionable.Controller.CombatModules/ItemUseModule.cs
View file

@ -84,7 +84,7 @@ internal sealed class ItemUseModule : ICombatModule
{ {
_delegate.Update(nextTarget); _delegate.Update(nextTarget);
} }
else if (_combatData.KillEnemyDataIds.Contains(nextTarget.DataId) || _combatData.ComplexCombatDatas.Any((ComplexCombatData x) => x.DataId == nextTarget.DataId && (!x.NameId.HasValue || (nextTarget is ICharacter character && x.NameId == character.NameId)))) else if (_combatData.KillEnemyDataIds.Contains(nextTarget.BaseId) || _combatData.ComplexCombatDatas.Any((ComplexCombatData x) => x.DataId == nextTarget.BaseId && (!x.NameId.HasValue || (nextTarget is ICharacter character && x.NameId == character.NameId))))
{ {
if (_isDoingRotation) if (_isDoingRotation)
{ {

4
Questionable/Questionable.Controller.CombatModules/Mount128Module.cs
View file

@ -50,8 +50,8 @@ internal sealed class Mount128Module : ICombatModule
public bool CanAttack(IBattleNpc target) public bool CanAttack(IBattleNpc target)
{ {
uint dataId = target.DataId; uint baseId = target.BaseId;
if (dataId - 7504 <= 1 || dataId == 14107) if (baseId - 7504 <= 1 || baseId == 14107)
{ {
return true; return true;
} }

2
Questionable/Questionable.Controller.CombatModules/Mount147Module.cs
View file

@ -46,6 +46,6 @@ internal sealed class Mount147Module : ICombatModule
public bool CanAttack(IBattleNpc target) public bool CanAttack(IBattleNpc target)
{ {
return target.DataId == 8593; return target.BaseId == 8593;
} }
} }

10
Questionable/Questionable.Controller.GameUi/InteractionUiController.cs
View file

@ -436,7 +436,7 @@ internal sealed class InteractionUiController : IDisposable
IGameObject target = _targetManager.Target; IGameObject target = _targetManager.Target;
if (target != null) if (target != null)
{ {
foreach (IQuestInfo item in from x in _questData.GetAllByIssuerDataId(target.DataId) foreach (IQuestInfo item in from x in _questData.GetAllByIssuerDataId(target.BaseId)
where x.QuestId is QuestId where x.QuestId is QuestId
select x) select x)
{ {
@ -485,9 +485,9 @@ internal sealed class InteractionUiController : IDisposable
_logger.LogDebug("Ignoring entry in DialogueChoices, no answer"); _logger.LogDebug("Ignoring entry in DialogueChoices, no answer");
continue; continue;
} }
if (dialogueChoice2.DataId.HasValue && dialogueChoice2.DataId != _targetManager.Target?.DataId) if (dialogueChoice2.DataId.HasValue && dialogueChoice2.DataId != _targetManager.Target?.BaseId)
{ {
_logger.LogDebug("Skipping entry in DialogueChoice expecting target dataId {ExpectedDataId}, actual target is {ActualTargetId}", dialogueChoice2.DataId, _targetManager.Target?.DataId); _logger.LogDebug("Skipping entry in DialogueChoice expecting target dataId {ExpectedDataId}, actual target is {ActualTargetId}", dialogueChoice2.DataId, _targetManager.Target?.BaseId);
continue; continue;
} }
StringOrRegex stringOrRegex = ResolveReference(quest3, dialogueChoice2.ExcelSheet, dialogueChoice2.Prompt, dialogueChoice2.PromptIsRegularExpression); StringOrRegex stringOrRegex = ResolveReference(quest3, dialogueChoice2.ExcelSheet, dialogueChoice2.Prompt, dialogueChoice2.PromptIsRegularExpression);
@ -739,9 +739,9 @@ internal sealed class InteractionUiController : IDisposable
{ {
continue; continue;
} }
if (dialogueChoice.DataId.HasValue && dialogueChoice.DataId != _targetManager.Target?.DataId) if (dialogueChoice.DataId.HasValue && dialogueChoice.DataId != _targetManager.Target?.BaseId)
{ {
_logger.LogDebug("Skipping entry in DialogueChoice expecting target dataId {ExpectedDataId}, actual target is {ActualTargetId}", dialogueChoice.DataId, _targetManager.Target?.DataId); _logger.LogDebug("Skipping entry in DialogueChoice expecting target dataId {ExpectedDataId}, actual target is {ActualTargetId}", dialogueChoice.DataId, _targetManager.Target?.BaseId);
continue; continue;
} }
StringOrRegex stringOrRegex = ResolveReference(quest, dialogueChoice.ExcelSheet, dialogueChoice.Prompt, dialogueChoice.PromptIsRegularExpression); StringOrRegex stringOrRegex = ResolveReference(quest, dialogueChoice.ExcelSheet, dialogueChoice.Prompt, dialogueChoice.PromptIsRegularExpression);

2
Questionable/Questionable.Controller.Steps.Gathering/MoveToLandingLocation.cs
View file

@ -33,7 +33,7 @@ internal static class MoveToLandingLocation
GatheringLocation location = base.Task.GatheringNode.Locations.First(); GatheringLocation location = base.Task.GatheringNode.Locations.First();
if (base.Task.GatheringNode.Locations.Count > 1) if (base.Task.GatheringNode.Locations.Count > 1)
{ {
IGameObject gameObject = objectTable.SingleOrDefault((IGameObject x) => x.ObjectKind == ObjectKind.GatheringPoint && x.DataId == base.Task.GatheringNode.DataId && x.IsTargetable); IGameObject gameObject = objectTable.SingleOrDefault((IGameObject x) => x.ObjectKind == ObjectKind.GatheringPoint && x.BaseId == base.Task.GatheringNode.DataId && x.IsTargetable);
if (gameObject == null) if (gameObject == null)
{ {
return false; return false;

4
Questionable/Questionable.Controller.Steps.Interactions/SinglePlayerDuty.cs
View file

@ -251,11 +251,11 @@ internal static class SinglePlayerDuty
public override ETaskResult Update() public override ETaskResult Update()
{ {
if (targetManager.Target?.DataId == base.Task.DataId) if (targetManager.Target?.BaseId == base.Task.DataId)
{ {
return ETaskResult.TaskComplete; return ETaskResult.TaskComplete;
} }
IGameObject gameObject = objectTable.FirstOrDefault((IGameObject x) => x.DataId == base.Task.DataId); IGameObject gameObject = objectTable.FirstOrDefault((IGameObject x) => x.BaseId == base.Task.DataId);
if (gameObject == null) if (gameObject == null)
{ {
return ETaskResult.StillRunning; return ETaskResult.StillRunning;

8
Questionable/Questionable.Controller/CombatController.cs
View file

@ -342,13 +342,13 @@ internal sealed class CombatController : IDisposable
{ {
for (int i = 0; i < complexCombatDatas.Count; i++) for (int i = 0; i < complexCombatDatas.Count; i++)
{ {
if (!_currentFight.Data.CompletedComplexDatas.Contains(i) && (!flag || complexCombatDatas[i].IgnoreQuestMarker || address->NamePlateIconId != 0) && complexCombatDatas[i].DataId == battleNpc.DataId && (!complexCombatDatas[i].NameId.HasValue || complexCombatDatas[i].NameId == battleNpc.NameId)) if (!_currentFight.Data.CompletedComplexDatas.Contains(i) && (!flag || complexCombatDatas[i].IgnoreQuestMarker || address->NamePlateIconId != 0) && complexCombatDatas[i].DataId == battleNpc.BaseId && (!complexCombatDatas[i].NameId.HasValue || complexCombatDatas[i].NameId == battleNpc.NameId))
{ {
return (Priority: 100, Reason: "CCD"); return (Priority: 100, Reason: "CCD");
} }
} }
} }
else if ((!flag || address->NamePlateIconId != 0) && _currentFight.Data.KillEnemyDataIds.Contains(battleNpc.DataId)) else if ((!flag || address->NamePlateIconId != 0) && _currentFight.Data.KillEnemyDataIds.Contains(battleNpc.BaseId))
{ {
return (Priority: 90, Reason: "KED"); return (Priority: 90, Reason: "KED");
} }
@ -441,7 +441,7 @@ internal sealed class CombatController : IDisposable
} }
if (!flag4) if (!flag4)
{ {
_logger.LogInformation("Moving to {TargetName} ({DataId}) to attack", gameObject.Name, gameObject.DataId); _logger.LogInformation("Moving to {TargetName} ({BaseId}) to attack", gameObject.Name, gameObject.BaseId);
MovementController movementController = _movementController; MovementController movementController = _movementController;
int num4 = 1; int num4 = 1;
List<Vector3> list = new List<Vector3>(num4); List<Vector3> list = new List<Vector3>(num4);
@ -453,7 +453,7 @@ internal sealed class CombatController : IDisposable
} }
else else
{ {
_logger.LogInformation("Moving to {TargetName} ({DataId}) to attack (with navmesh)", gameObject.Name, gameObject.DataId); _logger.LogInformation("Moving to {TargetName} ({BaseId}) to attack (with navmesh)", gameObject.Name, gameObject.BaseId);
_movementController.NavigateTo(EMovementType.Combat, null, gameObject.Position, fly: false, sprint: false, num3 + num - 0.25f, float.MaxValue); _movementController.NavigateTo(EMovementType.Combat, null, gameObject.Position, fly: false, sprint: false, num3 + num - 0.25f, float.MaxValue);
} }
} }

2
Questionable/Questionable.Controller/CommandHandler.cs
View file

@ -215,7 +215,7 @@ internal sealed class CommandHandler : IDisposable
List<string> list3 = new List<string>(); List<string> list3 = new List<string>();
ExcelSheet<ChocoboTaxiStand> excelSheet = _dataManager.GetExcelSheet<ChocoboTaxiStand>(); ExcelSheet<ChocoboTaxiStand> excelSheet = _dataManager.GetExcelSheet<ChocoboTaxiStand>();
UIState* ptr = UIState.Instance(); UIState* ptr = UIState.Instance();
for (byte b2 = 0; b2 < ptr->ChocoboTaxiStandsBitmask.Length * 8; b2++) for (byte b2 = 0; b2 < ptr->UnlockedChocoboTaxiStandsBitmask.Length * 8; b2++)
{ {
if (ptr->IsChocoboTaxiStandUnlocked(b2)) if (ptr->IsChocoboTaxiStandUnlocked(b2))
{ {

4
Questionable/Questionable.Controller/GatheringController.cs
View file

@ -207,7 +207,7 @@ internal sealed class GatheringController : MiniTaskController<GatheringControll
public bool HasNodeDisappeared(GatheringNode node) public bool HasNodeDisappeared(GatheringNode node)
{ {
return !_objectTable.Any((IGameObject x) => x.ObjectKind == ObjectKind.GatheringPoint && x.IsTargetable && x.DataId == node.DataId); return !_objectTable.Any((IGameObject x) => x.ObjectKind == ObjectKind.GatheringPoint && x.IsTargetable && x.BaseId == node.DataId);
} }
private GatheringNode? FindNextTargetableNodeAndUpdateIndex(CurrentRequest currentRequest) private GatheringNode? FindNextTargetableNodeAndUpdateIndex(CurrentRequest currentRequest)
@ -216,7 +216,7 @@ internal sealed class GatheringController : MiniTaskController<GatheringControll
{ {
int num = (currentRequest.CurrentIndex + i) % currentRequest.Nodes.Count; int num = (currentRequest.CurrentIndex + i) % currentRequest.Nodes.Count;
GatheringNode currentNode = currentRequest.Nodes[num]; GatheringNode currentNode = currentRequest.Nodes[num];
List<IGameObject> source = currentNode.Locations.Select((GatheringLocation x) => _objectTable.FirstOrDefault((IGameObject y) => currentNode.DataId == y.DataId && Vector3.Distance(x.Position, y.Position) < 0.1f)).ToList(); List<IGameObject> source = currentNode.Locations.Select((GatheringLocation x) => _objectTable.FirstOrDefault((IGameObject y) => currentNode.DataId == y.BaseId && Vector3.Distance(x.Position, y.Position) < 0.1f)).ToList();
if (source.Any((IGameObject x) => x == null)) if (source.Any((IGameObject x) => x == null))
{ {
currentRequest.CurrentIndex = (num + 1) % currentRequest.Nodes.Count; currentRequest.CurrentIndex = (num + 1) % currentRequest.Nodes.Count;

58
Questionable/Questionable.Controller/QuestController.cs
View file

@ -513,37 +513,35 @@ internal sealed class QuestController : MiniTaskController<QuestController>
} }
if (_startedQuest != null && !_questFunctions.IsQuestAccepted(_startedQuest.Quest.Id)) if (_startedQuest != null && !_questFunctions.IsQuestAccepted(_startedQuest.Quest.Id))
{ {
if (!_startedQuest.Quest.Info.IsRepeatable && !_questFunctions.IsQuestComplete(_startedQuest.Quest.Id) && _questFunctions.IsReadyToAcceptQuest(_startedQuest.Quest.Id)) if (_questFunctions.IsQuestComplete(_startedQuest.Quest.Id))
{ {
_logger.LogInformation("Quest {QuestId} is ready to accept but not yet accepted, moving to next quest", _startedQuest.Quest.Id); _logger.LogDebug("Quest {QuestId} is complete, clearing started quest", _startedQuest.Quest.Id);
SetNextQuest(_startedQuest.Quest);
_startedQuest = null; _startedQuest = null;
return;
} }
if (_startedQuest.Quest.Info.IsRepeatable) else
{ {
if (!_startedQuest.Quest.Info.IsRepeatable)
{
_logger.LogInformation("Quest {QuestId} was abandoned, clearing started quest", _startedQuest.Quest.Id);
(ElementId, byte)? tuple = (from x in ManualPriorityQuests
where _questFunctions.IsReadyToAcceptQuest(x.Id)
select ((ElementId Id, byte))(Id: x.Id, 0)).FirstOrDefault();
if (tuple.HasValue)
{
(ElementId, byte) valueOrDefault = tuple.GetValueOrDefault();
if ((object)valueOrDefault.Item1 != null && _questRegistry.TryGetQuest(valueOrDefault.Item1, out Quest quest))
{
_logger.LogInformation("Setting priority quest {QuestId} as next quest", valueOrDefault.Item1);
SetNextQuest(quest);
}
}
_startedQuest = null;
Stop("Quest abandoned");
return;
}
_logger.LogInformation("Repeatable quest {QuestId} is no longer accepted, clearing started quest", _startedQuest.Quest.Id); _logger.LogInformation("Repeatable quest {QuestId} is no longer accepted, clearing started quest", _startedQuest.Quest.Id);
_startedQuest = null; _startedQuest = null;
} }
else if (!_questFunctions.IsQuestComplete(_startedQuest.Quest.Id))
{
_logger.LogInformation("Quest {QuestId} was abandoned, clearing started quest", _startedQuest.Quest.Id);
(ElementId, byte)? tuple = (from x in ManualPriorityQuests
where _questFunctions.IsReadyToAcceptQuest(x.Id)
select ((ElementId Id, byte))(Id: x.Id, 0)).FirstOrDefault();
if (tuple.HasValue)
{
(ElementId, byte) valueOrDefault = tuple.GetValueOrDefault();
if ((object)valueOrDefault.Item1 != null && _questRegistry.TryGetQuest(valueOrDefault.Item1, out Quest quest))
{
_logger.LogInformation("Setting priority quest {QuestId} as next quest", valueOrDefault.Item1);
SetNextQuest(quest);
}
}
_startedQuest = null;
Stop("Quest abandoned");
return;
}
} }
if (_simulatedQuest == null && _nextQuest != null && !((!_nextQuest.Quest.Info.IsRepeatable) ? (!_questFunctions.IsQuestAcceptedOrComplete(_nextQuest.Quest.Id)) : (!_questFunctions.IsQuestAccepted(_nextQuest.Quest.Id)))) if (_simulatedQuest == null && _nextQuest != null && !((!_nextQuest.Quest.Info.IsRepeatable) ? (!_questFunctions.IsQuestAcceptedOrComplete(_nextQuest.Quest.Id)) : (!_questFunctions.IsQuestAccepted(_nextQuest.Quest.Id))))
{ {
@ -616,7 +614,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>
if ((object)valueOrDefault2.Item1 != null) if ((object)valueOrDefault2.Item1 != null)
{ {
(elementId, b) = valueOrDefault2; (elementId, b) = valueOrDefault2;
goto IL_08b5; goto IL_084c;
} }
} }
Quest quest2 = ManualPriorityQuests.FirstOrDefault((Quest x) => _questFunctions.IsReadyToAcceptQuest(x.Id)); Quest quest2 = ManualPriorityQuests.FirstOrDefault((Quest x) => _questFunctions.IsReadyToAcceptQuest(x.Id));
@ -626,7 +624,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>
SetNextQuest(quest2); SetNextQuest(quest2);
return; return;
} }
goto IL_08b5; goto IL_084c;
} }
questProgress = _startedQuest; questProgress = _startedQuest;
b = _startedQuest.Sequence; b = _startedQuest.Sequence;
@ -673,8 +671,8 @@ internal sealed class QuestController : MiniTaskController<QuestController>
} }
} }
} }
goto IL_0be5; goto IL_0b7c;
IL_0be5: IL_0b7c:
if (questProgress == null) if (questProgress == null)
{ {
DebugState = "No quest active"; DebugState = "No quest active";
@ -733,7 +731,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>
DebugState = null; DebugState = null;
} }
return; return;
IL_08b5: IL_084c:
if (elementId == null || elementId.Value == 0) if (elementId == null || elementId.Value == 0)
{ {
if (_startedQuest != null) if (_startedQuest != null)
@ -793,7 +791,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>
} }
questProgress = _startedQuest; questProgress = _startedQuest;
} }
goto IL_0be5; goto IL_0b7c;
} }
} }

6
Questionable/Questionable.Functions/GameFunctions.cs
View file

@ -133,7 +133,7 @@ internal sealed class GameFunctions
{ {
Dalamud.Game.ClientState.Objects.Enums.ObjectKind objectKind = item.ObjectKind; Dalamud.Game.ClientState.Objects.Enums.ObjectKind objectKind = item.ObjectKind;
bool flag = ((objectKind == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Player || objectKind - 8 <= Dalamud.Game.ClientState.Objects.Enums.ObjectKind.BattleNpc || objectKind == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Housing) ? true : false); bool flag = ((objectKind == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Player || objectKind - 8 <= Dalamud.Game.ClientState.Objects.Enums.ObjectKind.BattleNpc || objectKind == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Housing) ? true : false);
if (!flag && (item == null || item.ObjectKind != Dalamud.Game.ClientState.Objects.Enums.ObjectKind.GatheringPoint || item.IsTargetable) && item.DataId == dataId && (!kind.HasValue || kind.Value == item.ObjectKind)) if (!flag && (item == null || item.ObjectKind != Dalamud.Game.ClientState.Objects.Enums.ObjectKind.GatheringPoint || item.IsTargetable) && item.BaseId == dataId && (!kind.HasValue || kind.Value == item.ObjectKind))
{ {
return item; return item;
} }
@ -155,7 +155,7 @@ internal sealed class GameFunctions
public unsafe bool InteractWith(IGameObject gameObject) public unsafe bool InteractWith(IGameObject gameObject)
{ {
_logger.LogInformation("Setting target with {DataId} to {ObjectId}", gameObject.DataId, gameObject.EntityId); _logger.LogInformation("Setting target with {DataId} to {ObjectId}", gameObject.BaseId, gameObject.EntityId);
_targetManager.Target = null; _targetManager.Target = null;
_targetManager.Target = gameObject; _targetManager.Target = gameObject;
if (gameObject.ObjectKind == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.GatheringPoint) if (gameObject.ObjectKind == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.GatheringPoint)
@ -459,7 +459,7 @@ internal sealed class GameFunctions
{ {
return false; return false;
} }
if (_targetManager.Target == null || _targetManager.Target.DataId != currentQuest.Info.IssuerDataId) if (_targetManager.Target == null || _targetManager.Target.BaseId != currentQuest.Info.IssuerDataId)
{ {
return false; return false;
} }

12
Questionable/Questionable.Functions/QuestFunctions.cs
View file

@ -54,6 +54,8 @@ internal sealed class QuestFunctions
private readonly HashSet<ushort> _alreadyLoggedUnobtainableQuestsDetailed = new HashSet<ushort>(); private readonly HashSet<ushort> _alreadyLoggedUnobtainableQuestsDetailed = new HashSet<ushort>();
private readonly HashSet<ushort> _alreadyLoggedLevelRequirements = new HashSet<ushort>();
public QuestFunctions(QuestRegistry questRegistry, QuestData questData, AetheryteFunctions aetheryteFunctions, AlliedSocietyQuestFunctions alliedSocietyQuestFunctions, AlliedSocietyData alliedSocietyData, AetheryteData aetheryteData, Configuration configuration, IDataManager dataManager, IClientState clientState, IGameGui gameGui, IAetheryteList aetheryteList, ILogger<QuestFunctions> logger) public QuestFunctions(QuestRegistry questRegistry, QuestData questData, AetheryteFunctions aetheryteFunctions, AlliedSocietyQuestFunctions alliedSocietyQuestFunctions, AlliedSocietyData alliedSocietyData, AetheryteData aetheryteData, Configuration configuration, IDataManager dataManager, IClientState clientState, IGameGui gameGui, IAetheryteList aetheryteList, ILogger<QuestFunctions> logger)
{ {
_questRegistry = questRegistry; _questRegistry = questRegistry;
@ -574,12 +576,18 @@ internal sealed class QuestFunctions
} }
if (quest != null && quest.Info.Level > b) if (quest != null && quest.Info.Level > b)
{ {
_logger.LogDebug("Quest {QuestId} level requirement not met: required {RequiredLevel}, current {CurrentLevel}", questId, quest.Info.Level, b); if (_alreadyLoggedLevelRequirements.Add(questId.Value))
{
_logger.LogDebug("Quest {QuestId} level requirement not met: required {RequiredLevel}, current {CurrentLevel}", questId, quest.Info.Level, b);
}
return false; return false;
} }
if (quest == null && questId is QuestId questId3 && _questData.TryGetQuestInfo(questId3, out IQuestInfo questInfo) && questInfo is QuestInfo questInfo2 && questInfo2.Level > b) if (quest == null && questId is QuestId questId3 && _questData.TryGetQuestInfo(questId3, out IQuestInfo questInfo) && questInfo is QuestInfo questInfo2 && questInfo2.Level > b)
{ {
_logger.LogDebug("Quest {QuestId} (from data) level requirement not met: required {RequiredLevel}, current {CurrentLevel}", questId3, questInfo2.Level, b); if (_alreadyLoggedLevelRequirements.Add(questId3.Value))
{
_logger.LogDebug("Quest {QuestId} (from data) level requirement not met: required {RequiredLevel}, current {CurrentLevel}", questId3, questInfo2.Level, b);
}
return false; return false;
} }
} }

14
Questionable/Questionable.Windows.QuestComponents/CreationUtilsComponent.cs
View file

@ -125,7 +125,7 @@ internal sealed class CreationUtilsComponent
handler.AppendLiteral(" ("); handler.AppendLiteral(" (");
handler.AppendFormatted(target.ObjectKind); handler.AppendFormatted(target.ObjectKind);
handler.AppendLiteral("; "); handler.AppendLiteral("; ");
handler.AppendFormatted(target.DataId); handler.AppendFormatted(target.BaseId);
handler.AppendFormatted(value); handler.AppendFormatted(value);
handler.AppendLiteral(")"); handler.AppendLiteral(")");
ImGui.Text(string.Create(provider, ref handler)); ImGui.Text(string.Create(provider, ref handler));
@ -169,7 +169,7 @@ internal sealed class CreationUtilsComponent
{ {
if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Bullseye, "To Target")) if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Bullseye, "To Target"))
{ {
_movementController.NavigateTo(EMovementType.DebugWindow, target.DataId, target.Position, _condition[ConditionFlag.Mounted] && _gameFunctions.IsFlyingUnlockedInCurrentZone(), sprint: true); _movementController.NavigateTo(EMovementType.DebugWindow, target.BaseId, target.Position, _condition[ConditionFlag.Mounted] && _gameFunctions.IsFlyingUnlockedInCurrentZone(), sprint: true);
} }
} }
else if (ImGui.Button("Cancel pathfinding")) else if (ImGui.Button("Cancel pathfinding"))
@ -178,7 +178,7 @@ internal sealed class CreationUtilsComponent
} }
ImGui.EndDisabled(); ImGui.EndDisabled();
ImGui.SameLine(); ImGui.SameLine();
ImGui.BeginDisabled(!_questData.IsIssuerOfAnyQuest(target.DataId)); ImGui.BeginDisabled(!_questData.IsIssuerOfAnyQuest(target.BaseId));
bool num = ImGuiComponents.IconButton(FontAwesomeIcon.MapMarkerAlt); bool num = ImGuiComponents.IconButton(FontAwesomeIcon.MapMarkerAlt);
if (ImGui.IsItemHovered()) if (ImGui.IsItemHovered())
{ {
@ -219,7 +219,7 @@ internal sealed class CreationUtilsComponent
{ {
clipboardText = new ImU8String(59, 4); clipboardText = new ImU8String(59, 4);
clipboardText.AppendLiteral("\"DataId\": "); clipboardText.AppendLiteral("\"DataId\": ");
clipboardText.AppendFormatted(target.DataId); clipboardText.AppendFormatted(target.BaseId);
clipboardText.AppendLiteral(",\n\"Position\": {\n \"X\": "); clipboardText.AppendLiteral(",\n\"Position\": {\n \"X\": ");
clipboardText.AppendFormatted(target.Position.X.ToString(CultureInfo.InvariantCulture)); clipboardText.AppendFormatted(target.Position.X.ToString(CultureInfo.InvariantCulture));
clipboardText.AppendLiteral(",\n \"Y\": "); clipboardText.AppendLiteral(",\n \"Y\": ");
@ -264,7 +264,7 @@ internal sealed class CreationUtilsComponent
string value = text; string value = text;
clipboardText = new ImU8String(99, 6); clipboardText = new ImU8String(99, 6);
clipboardText.AppendLiteral("\"DataId\": "); clipboardText.AppendLiteral("\"DataId\": ");
clipboardText.AppendFormatted(target.DataId); clipboardText.AppendFormatted(target.BaseId);
clipboardText.AppendLiteral(",\n\"Position\": {\n \"X\": "); clipboardText.AppendLiteral(",\n\"Position\": {\n \"X\": ");
clipboardText.AppendFormatted(target.Position.X.ToString(CultureInfo.InvariantCulture)); clipboardText.AppendFormatted(target.Position.X.ToString(CultureInfo.InvariantCulture));
clipboardText.AppendLiteral(",\n \"Y\": "); clipboardText.AppendLiteral(",\n \"Y\": ");
@ -283,12 +283,12 @@ internal sealed class CreationUtilsComponent
DefaultInterpolatedStringHandler handler; DefaultInterpolatedStringHandler handler;
if (target.ObjectKind == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Aetheryte) if (target.ObjectKind == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Aetheryte)
{ {
EAetheryteLocation dataId = (EAetheryteLocation)target.DataId; EAetheryteLocation baseId = (EAetheryteLocation)target.BaseId;
IFormatProvider invariantCulture = CultureInfo.InvariantCulture; IFormatProvider invariantCulture = CultureInfo.InvariantCulture;
IFormatProvider provider = invariantCulture; IFormatProvider provider = invariantCulture;
handler = new DefaultInterpolatedStringHandler(36, 4, invariantCulture); handler = new DefaultInterpolatedStringHandler(36, 4, invariantCulture);
handler.AppendLiteral("{EAetheryteLocation."); handler.AppendLiteral("{EAetheryteLocation.");
handler.AppendFormatted(dataId); handler.AppendFormatted(baseId);
handler.AppendLiteral(", new("); handler.AppendLiteral(", new(");
handler.AppendFormatted(target.Position.X); handler.AppendFormatted(target.Position.X);
handler.AppendLiteral("f, "); handler.AppendLiteral("f, ");

2
Questionable/Questionable.Windows/DebugOverlay.cs
View file

@ -169,7 +169,7 @@ internal sealed class DebugOverlay : Window
text.AppendLiteral("/"); text.AppendLiteral("/");
text.AppendFormatted(item3.GameObjectId, "X"); text.AppendFormatted(item3.GameObjectId, "X");
text.AppendLiteral(", "); text.AppendLiteral(", ");
text.AppendFormatted(item3.DataId); text.AppendFormatted(item3.BaseId);
text.AppendLiteral(", "); text.AppendLiteral(", ");
text.AppendFormatted(item); text.AppendFormatted(item);
text.AppendLiteral(" - "); text.AppendLiteral(" - ");

6
Questionable/Questionable.Windows/QuestSelectionWindow.cs
View file

@ -82,10 +82,10 @@ internal sealed class QuestSelectionWindow : LWindow
{ {
if (gameObject != null) if (gameObject != null)
{ {
uint dataId = gameObject.DataId; uint baseId = gameObject.BaseId;
string value = gameObject.Name.ToString(); string value = gameObject.Name.ToString();
base.WindowName = $"Quests starting with {value} [{dataId}]{"###QuestionableQuestSelection"}"; base.WindowName = $"Quests starting with {value} [{baseId}]{"###QuestionableQuestSelection"}";
_quests = _questData.GetAllByIssuerDataId(dataId); _quests = _questData.GetAllByIssuerDataId(baseId);
if (_gameGui.TryGetAddonByName<AddonSelectIconString>("SelectIconString", out var addonPtr)) if (_gameGui.TryGetAddonByName<AddonSelectIconString>("SelectIconString", out var addonPtr))
{ {
List<string?> answers = InteractionUiController.GetChoices(addonPtr); List<string?> answers = InteractionUiController.GetChoices(addonPtr);

90
Solution.sln
View file

@ -2,15 +2,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio 14
VisualStudioVersion = 14.0.24720.0 VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuestPaths", "QuestPaths\QuestPaths.csproj", "{8543D75D-1A2C-4045-9927-61FB7462F896}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuestPaths", "QuestPaths\QuestPaths.csproj", "{33884875-12A7-4737-9AE0-22BA23C5F933}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GatheringPaths", "GatheringPaths\GatheringPaths.csproj", "{6B22392B-ADAB-4D34-B7DD-7443345BEE26}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GatheringPaths", "GatheringPaths\GatheringPaths.csproj", "{577D196C-BA5A-410B-99D8-8242BA2EC631}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Questionable", "Questionable\Questionable.csproj", "{4C05BCC5-1221-4DAA-B897-52C8C3E2CD09}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Questionable", "Questionable\Questionable.csproj", "{589FE93D-4A62-47CD-91FF-833BCE031B3D}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Questionable.Model", "Questionable.Model\Questionable.Model.csproj", "{5C131661-EDC1-4590-AC47-C38B0A5BA139}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Questionable.Model", "Questionable.Model\Questionable.Model.csproj", "{932D91F5-DA79-4120-862D-3E35C6F92408}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LLib", "LLib\LLib.csproj", "{CC748521-A62A-43A0-BB7B-90F96740C38E}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LLib", "LLib\LLib.csproj", "{6E090518-C6E6-4D84-A889-67976D3C2CB5}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -20,46 +20,46 @@ Global
Release|x64 = Release|x64 Release|x64 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8543D75D-1A2C-4045-9927-61FB7462F896}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU {33884875-12A7-4737-9AE0-22BA23C5F933}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU
{8543D75D-1A2C-4045-9927-61FB7462F896}.Debug|AnyCPU.Build.0 = Debug|AnyCPU {33884875-12A7-4737-9AE0-22BA23C5F933}.Debug|AnyCPU.Build.0 = Debug|AnyCPU
{8543D75D-1A2C-4045-9927-61FB7462F896}.Debug|x64.ActiveCfg = Debug|AnyCPU {33884875-12A7-4737-9AE0-22BA23C5F933}.Debug|x64.ActiveCfg = Debug|AnyCPU
{8543D75D-1A2C-4045-9927-61FB7462F896}.Debug|x64.Build.0 = Debug|AnyCPU {33884875-12A7-4737-9AE0-22BA23C5F933}.Debug|x64.Build.0 = Debug|AnyCPU
{8543D75D-1A2C-4045-9927-61FB7462F896}.Release|AnyCPU.ActiveCfg = Release|AnyCPU {33884875-12A7-4737-9AE0-22BA23C5F933}.Release|AnyCPU.ActiveCfg = Release|AnyCPU
{8543D75D-1A2C-4045-9927-61FB7462F896}.Release|AnyCPU.Build.0 = Release|AnyCPU {33884875-12A7-4737-9AE0-22BA23C5F933}.Release|AnyCPU.Build.0 = Release|AnyCPU
{8543D75D-1A2C-4045-9927-61FB7462F896}.Release|x64.ActiveCfg = Release|AnyCPU {33884875-12A7-4737-9AE0-22BA23C5F933}.Release|x64.ActiveCfg = Release|AnyCPU
{8543D75D-1A2C-4045-9927-61FB7462F896}.Release|x64.Build.0 = Release|AnyCPU {33884875-12A7-4737-9AE0-22BA23C5F933}.Release|x64.Build.0 = Release|AnyCPU
{6B22392B-ADAB-4D34-B7DD-7443345BEE26}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU {577D196C-BA5A-410B-99D8-8242BA2EC631}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU
{6B22392B-ADAB-4D34-B7DD-7443345BEE26}.Debug|AnyCPU.Build.0 = Debug|AnyCPU {577D196C-BA5A-410B-99D8-8242BA2EC631}.Debug|AnyCPU.Build.0 = Debug|AnyCPU
{6B22392B-ADAB-4D34-B7DD-7443345BEE26}.Debug|x64.ActiveCfg = Debug|AnyCPU {577D196C-BA5A-410B-99D8-8242BA2EC631}.Debug|x64.ActiveCfg = Debug|AnyCPU
{6B22392B-ADAB-4D34-B7DD-7443345BEE26}.Debug|x64.Build.0 = Debug|AnyCPU {577D196C-BA5A-410B-99D8-8242BA2EC631}.Debug|x64.Build.0 = Debug|AnyCPU
{6B22392B-ADAB-4D34-B7DD-7443345BEE26}.Release|AnyCPU.ActiveCfg = Release|AnyCPU {577D196C-BA5A-410B-99D8-8242BA2EC631}.Release|AnyCPU.ActiveCfg = Release|AnyCPU
{6B22392B-ADAB-4D34-B7DD-7443345BEE26}.Release|AnyCPU.Build.0 = Release|AnyCPU {577D196C-BA5A-410B-99D8-8242BA2EC631}.Release|AnyCPU.Build.0 = Release|AnyCPU
{6B22392B-ADAB-4D34-B7DD-7443345BEE26}.Release|x64.ActiveCfg = Release|AnyCPU {577D196C-BA5A-410B-99D8-8242BA2EC631}.Release|x64.ActiveCfg = Release|AnyCPU
{6B22392B-ADAB-4D34-B7DD-7443345BEE26}.Release|x64.Build.0 = Release|AnyCPU {577D196C-BA5A-410B-99D8-8242BA2EC631}.Release|x64.Build.0 = Release|AnyCPU
{4C05BCC5-1221-4DAA-B897-52C8C3E2CD09}.Debug|AnyCPU.ActiveCfg = Debug|x64 {589FE93D-4A62-47CD-91FF-833BCE031B3D}.Debug|AnyCPU.ActiveCfg = Debug|x64
{4C05BCC5-1221-4DAA-B897-52C8C3E2CD09}.Debug|AnyCPU.Build.0 = Debug|x64 {589FE93D-4A62-47CD-91FF-833BCE031B3D}.Debug|AnyCPU.Build.0 = Debug|x64
{4C05BCC5-1221-4DAA-B897-52C8C3E2CD09}.Debug|x64.ActiveCfg = Debug|x64 {589FE93D-4A62-47CD-91FF-833BCE031B3D}.Debug|x64.ActiveCfg = Debug|x64
{4C05BCC5-1221-4DAA-B897-52C8C3E2CD09}.Debug|x64.Build.0 = Debug|x64 {589FE93D-4A62-47CD-91FF-833BCE031B3D}.Debug|x64.Build.0 = Debug|x64
{4C05BCC5-1221-4DAA-B897-52C8C3E2CD09}.Release|AnyCPU.ActiveCfg = Release|x64 {589FE93D-4A62-47CD-91FF-833BCE031B3D}.Release|AnyCPU.ActiveCfg = Release|x64
{4C05BCC5-1221-4DAA-B897-52C8C3E2CD09}.Release|AnyCPU.Build.0 = Release|x64 {589FE93D-4A62-47CD-91FF-833BCE031B3D}.Release|AnyCPU.Build.0 = Release|x64
{4C05BCC5-1221-4DAA-B897-52C8C3E2CD09}.Release|x64.ActiveCfg = Release|x64 {589FE93D-4A62-47CD-91FF-833BCE031B3D}.Release|x64.ActiveCfg = Release|x64
{4C05BCC5-1221-4DAA-B897-52C8C3E2CD09}.Release|x64.Build.0 = Release|x64 {589FE93D-4A62-47CD-91FF-833BCE031B3D}.Release|x64.Build.0 = Release|x64
{5C131661-EDC1-4590-AC47-C38B0A5BA139}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU {932D91F5-DA79-4120-862D-3E35C6F92408}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU
{5C131661-EDC1-4590-AC47-C38B0A5BA139}.Debug|AnyCPU.Build.0 = Debug|AnyCPU {932D91F5-DA79-4120-862D-3E35C6F92408}.Debug|AnyCPU.Build.0 = Debug|AnyCPU
{5C131661-EDC1-4590-AC47-C38B0A5BA139}.Debug|x64.ActiveCfg = Debug|AnyCPU {932D91F5-DA79-4120-862D-3E35C6F92408}.Debug|x64.ActiveCfg = Debug|AnyCPU
{5C131661-EDC1-4590-AC47-C38B0A5BA139}.Debug|x64.Build.0 = Debug|AnyCPU {932D91F5-DA79-4120-862D-3E35C6F92408}.Debug|x64.Build.0 = Debug|AnyCPU
{5C131661-EDC1-4590-AC47-C38B0A5BA139}.Release|AnyCPU.ActiveCfg = Release|AnyCPU {932D91F5-DA79-4120-862D-3E35C6F92408}.Release|AnyCPU.ActiveCfg = Release|AnyCPU
{5C131661-EDC1-4590-AC47-C38B0A5BA139}.Release|AnyCPU.Build.0 = Release|AnyCPU {932D91F5-DA79-4120-862D-3E35C6F92408}.Release|AnyCPU.Build.0 = Release|AnyCPU
{5C131661-EDC1-4590-AC47-C38B0A5BA139}.Release|x64.ActiveCfg = Release|AnyCPU {932D91F5-DA79-4120-862D-3E35C6F92408}.Release|x64.ActiveCfg = Release|AnyCPU
{5C131661-EDC1-4590-AC47-C38B0A5BA139}.Release|x64.Build.0 = Release|AnyCPU {932D91F5-DA79-4120-862D-3E35C6F92408}.Release|x64.Build.0 = Release|AnyCPU
{CC748521-A62A-43A0-BB7B-90F96740C38E}.Debug|AnyCPU.ActiveCfg = Debug|x64 {6E090518-C6E6-4D84-A889-67976D3C2CB5}.Debug|AnyCPU.ActiveCfg = Debug|x64
{CC748521-A62A-43A0-BB7B-90F96740C38E}.Debug|AnyCPU.Build.0 = Debug|x64 {6E090518-C6E6-4D84-A889-67976D3C2CB5}.Debug|AnyCPU.Build.0 = Debug|x64
{CC748521-A62A-43A0-BB7B-90F96740C38E}.Debug|x64.ActiveCfg = Debug|x64 {6E090518-C6E6-4D84-A889-67976D3C2CB5}.Debug|x64.ActiveCfg = Debug|x64
{CC748521-A62A-43A0-BB7B-90F96740C38E}.Debug|x64.Build.0 = Debug|x64 {6E090518-C6E6-4D84-A889-67976D3C2CB5}.Debug|x64.Build.0 = Debug|x64
{CC748521-A62A-43A0-BB7B-90F96740C38E}.Release|AnyCPU.ActiveCfg = Release|x64 {6E090518-C6E6-4D84-A889-67976D3C2CB5}.Release|AnyCPU.ActiveCfg = Release|x64
{CC748521-A62A-43A0-BB7B-90F96740C38E}.Release|AnyCPU.Build.0 = Release|x64 {6E090518-C6E6-4D84-A889-67976D3C2CB5}.Release|AnyCPU.Build.0 = Release|x64
{CC748521-A62A-43A0-BB7B-90F96740C38E}.Release|x64.ActiveCfg = Release|x64 {6E090518-C6E6-4D84-A889-67976D3C2CB5}.Release|x64.ActiveCfg = Release|x64
{CC748521-A62A-43A0-BB7B-90F96740C38E}.Release|x64.Build.0 = Release|x64 {6E090518-C6E6-4D84-A889-67976D3C2CB5}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE