cacahuetes/Questionable
1
0
Fork 0
forked from liza/Questionable
Code Pull Requests 1 Activity

master #3

Open
cacahuetes wants to merge 673 commits from liza/Questionable:master into cacahuetes-ShB-Healer
pull from: liza/Questionable:master
merge into: cacahuetes:cacahuetes-ShB-Healer
Conversation 0 Commits 673 Files Changed 1519 +5 -14
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4ccd615832 - Show all commits

14
QuestPaths/6.x - Endwalker/Class Quests/SGE/4068_Sage's Focus.json
View File

@ -33,13 +33,8 @@
"TerritoryId": 134, "TerritoryId": 134,
"InteractionType": "EquipItem", "InteractionType": "EquipItem",
"ItemId": 35778, "ItemId": 35778,
"AetheryteShortcut": "Middle La Noscea - Summerford Farms",
"Fly": true,
"Comment": "Try to Equip Stonegold Milpreves", "Comment": "Try to Equip Stonegold Milpreves",
"SkipConditions": { "SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
},
"StepIf": { "StepIf": {
"Item": { "Item": {
"NotInInventory": true "NotInInventory": true
@ -60,14 +55,7 @@
}, },
"StopDistance": 5, "StopDistance": 5,
"TerritoryId": 134, "TerritoryId": 134,
"InteractionType": "AcceptQuest", "InteractionType": "AcceptQuest"
"AetheryteShortcut": "Middle La Noscea - Summerford Farms",
"Fly": true,
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
} }
] ]
}, },

2
Questionable/Controller/Steps/Interactions/EquipItem.cs
View File

@ -158,6 +158,8 @@ internal static class EquipItem
return; return;
} }
} }
throw new TaskException($"Could not equip item {Task.ItemId}.");
} }
private static List<ushort>? GetEquipSlot(Item item) private static List<ushort>? GetEquipSlot(Item item)

3
Questionable/Controller/Steps/Shared/SkipCondition.cs
View File

@ -144,7 +144,8 @@ internal static class SkipCondition
if (skipConditions.Item is { NotInInventory: true } && step is { ItemId: not null }) if (skipConditions.Item is { NotInInventory: true } && step is { ItemId: not null })
{ {
InventoryManager* inventoryManager = InventoryManager.Instance(); InventoryManager* inventoryManager = InventoryManager.Instance();
if (inventoryManager->GetInventoryItemCount(step.ItemId.Value) == 0) if (inventoryManager->GetInventoryItemCount(step.ItemId.Value) == 0 &&
inventoryManager->GetInventoryItemCount(step.ItemId.Value, true) == 0)
{ {
logger.LogInformation("Skipping step, no item with itemId {ItemId} in inventory", logger.LogInformation("Skipping step, no item with itemId {ItemId} in inventory",
step.ItemId.Value); step.ItemId.Value);