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

master #3

Open
cacahuetes wants to merge 653 commits from liza/Questionable:master into cacahuetes-ShB-Healer
pull from: liza/Questionable:master
merge into: cacahuetes:cacahuetes-ShB-Healer
Conversation 0 Commits 653 Files Changed 1490 +112 -10
20 changed files with 112 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7382131246 - Show all commits

3
QuestPathGenerator/RoslynElements/QuestStepExtensions.cs
View File

@ -97,6 +97,9 @@ internal static class QuestStepExtensions
.AsSyntaxNodeOrToken(),
Assignment(nameof(QuestStep.Status), step.Status, emptyStep.Status)
.AsSyntaxNodeOrToken(),
Assignment(nameof(QuestStep.TargetClass), step.TargetClass,
emptyStep.TargetClass)
.AsSyntaxNodeOrToken(),
Assignment(nameof(QuestStep.EnemySpawnType), step.EnemySpawnType,
emptyStep.EnemySpawnType)
.AsSyntaxNodeOrToken(),

5
QuestPaths/3.x - Heavensward/Custom Deliveries/Zhloe/S1_Zhloe Aliapoh.json
View File

@ -5,6 +5,11 @@
{
"Sequence": 0,
"Steps": [
{
"TerritoryId": 478,
"InteractionType": "SwitchClass",
"TargetClass": "Blue Mage"
},
{
"TerritoryId": 478,
"InteractionType": "Gather",

5
QuestPaths/4.x - Stormblood/Custom Deliveries/Adkiragh/S4_Adkiragh.json
View File

@ -5,6 +5,11 @@
{
"Sequence": 0,
"Steps": [
{
"TerritoryId": 478,
"InteractionType": "SwitchClass",
"TargetClass": "Blue Mage"
},
{
"TerritoryId": 478,
"InteractionType": "Gather",

5
QuestPaths/4.x - Stormblood/Custom Deliveries/Kurenai/S3_Kurenai.json
View File

@ -5,6 +5,11 @@
{
"Sequence": 0,
"Steps": [
{
"TerritoryId": 613,
"InteractionType": "SwitchClass",
"TargetClass": "Blue Mage"
},
{
"TerritoryId": 613,
"InteractionType": "Gather",

5
QuestPaths/4.x - Stormblood/Custom Deliveries/M'naago/S2_M'naago.json
View File

@ -5,6 +5,11 @@
{
"Sequence": 0,
"Steps": [
{
"TerritoryId": 635,
"InteractionType": "SwitchClass",
"TargetClass": "Blue Mage"
},
{
"TerritoryId": 635,
"InteractionType": "Gather",

5
QuestPaths/5.x - Shadowbringers/Custom Deliveries/Charlemend/S7_Charlemend.json
View File

@ -5,6 +5,11 @@
{
"Sequence": 0,
"Steps": [
{
"TerritoryId": 886,
"InteractionType": "SwitchClass",
"TargetClass": "Blue Mage"
},
{
"TerritoryId": 886,
"InteractionType": "Gather",

5
QuestPaths/5.x - Shadowbringers/Custom Deliveries/Ehll Tou/S6_Ehll Tou.json
View File

@ -5,6 +5,11 @@
{
"Sequence": 0,
"Steps": [
{
"TerritoryId": 886,
"InteractionType": "SwitchClass",
"TargetClass": "Blue Mage"
},
{
"TerritoryId": 886,
"InteractionType": "Gather",

5
QuestPaths/5.x - Shadowbringers/Custom Deliveries/Kai-Shirr/S5_Kai-Shirr.json
View File

@ -5,6 +5,11 @@
{
"Sequence": 0,
"Steps": [
{
"TerritoryId": 820,
"InteractionType": "SwitchClass",
"TargetClass": "Blue Mage"
},
{
"TerritoryId": 820,
"InteractionType": "Gather",

5
QuestPaths/6.x - Endwalker/Custom Deliveries/Ameliance/S8_Ameliance.json
View File

@ -5,6 +5,11 @@
{
"Sequence": 0,
"Steps": [
{
"TerritoryId": 962,
"InteractionType": "SwitchClass",
"TargetClass": "Blue Mage"
},
{
"TerritoryId": 962,
"InteractionType": "Gather",

5
QuestPaths/6.x - Endwalker/Custom Deliveries/Anden/S9_Anden.json
View File

@ -5,6 +5,11 @@
{
"Sequence": 0,
"Steps": [
{
"TerritoryId": 816,
"InteractionType": "SwitchClass",
"TargetClass": "Blue Mage"
},
{
"TerritoryId": 816,
"InteractionType": "Gather",

5
QuestPaths/6.x - Endwalker/Custom Deliveries/Margrat/S10_Margrat.json
View File

@ -5,6 +5,11 @@
{
"Sequence": 0,
"Steps": [
{
"TerritoryId": 956,
"InteractionType": "SwitchClass",
"TargetClass": "Blue Mage"
},
{
"TerritoryId": 956,
"InteractionType": "Gather",

20
QuestPaths/quest-v1.json
View File

@ -128,6 +128,7 @@
"Craft",
"Gather",
"Snipe",
"SwitchClass",
"Instruction",
"AcceptQuest",
"CompleteQuest",
@ -1365,6 +1366,25 @@
"Comment"
]
}
},
{
"if": {
"properties": {
"InteractionType": {
"const": "SwitchClass"
}
}
},
"then": {
"properties": {
"TargetClass": {
"$ref": "https://git.carvel.li/liza/Questionable/raw/branch/master/Questionable.Model/common-schema.json#/$defs/ClassJob"
}
},
"required": [
"TargetClass"
]
}
}
]
}

1
Questionable.Model/Questing/Converter/ExtendedClassJobConverter.cs
View File

@ -7,6 +7,7 @@ internal sealed class ExtendedClassJobConverter() : EnumConverter<EExtendedClass
{
private static readonly Dictionary<EExtendedClassJob, string> Values = new()
{
{ EExtendedClassJob.None, "None" },
{ EExtendedClassJob.Gladiator, "Gladiator" },
{ EExtendedClassJob.Pugilist, "Pugilist" },
{ EExtendedClassJob.Marauder, "Marauder" },

1
Questionable.Model/Questing/Converter/InteractionTypeConverter.cs
View File

@ -31,6 +31,7 @@ public sealed class InteractionTypeConverter() : EnumConverter<EInteractionType>
{ EInteractionType.Craft, "Craft" },
{ EInteractionType.Gather, "Gather" },
{ EInteractionType.Snipe, "Snipe" },
{ EInteractionType.SwitchClass, "SwitchClass" },
{ EInteractionType.Instruction, "Instruction" },
{ EInteractionType.AcceptQuest, "AcceptQuest" },
{ EInteractionType.CompleteQuest, "CompleteQuest" },

2
Questionable.Model/Questing/EExtendedClassJob.cs
View File

@ -6,6 +6,7 @@ namespace Questionable.Model.Questing;
[JsonConverter(typeof(ExtendedClassJobConverter))]
public enum EExtendedClassJob
{
None,
Gladiator,
Pugilist,
Marauder,
@ -53,3 +54,4 @@ public enum EExtendedClassJob
DoH,
DoL,
}

1
Questionable.Model/Questing/EInteractionType.cs
View File

@ -30,6 +30,7 @@ public enum EInteractionType
Craft,
Gather,
Snipe,
SwitchClass,
/// <summary>
/// Needs to be manually continued.

1
Questionable.Model/Questing/QuestStep.cs
View File

@ -64,6 +64,7 @@ public sealed class QuestStep
public ChatMessage? ChatMessage { get; set; }
public EAction? Action { get; set; }
public EStatus? Status { get; set; }
public EExtendedClassJob TargetClass { get; set; } = EExtendedClassJob.None;
public EEnemySpawnType? EnemySpawnType { get; set; }
public List<uint> KillEnemyDataIds { get; set; } = [];

22
Questionable/Controller/ContextMenuController.cs
View File

@ -71,14 +71,16 @@ internal sealed class ContextMenuController : IDisposable
if (_gatheringData.TryGetCustomDeliveryNpc(itemId, out uint npcId))
{
AddContextMenuEntry(args, itemId, npcId, EClassJob.Miner, "Mine");
AddContextMenuEntry(args, itemId, npcId, EClassJob.Botanist, "Harvest");
AddContextMenuEntry(args, itemId, npcId, EExtendedClassJob.Miner, "Mine");
AddContextMenuEntry(args, itemId, npcId, EExtendedClassJob.Botanist, "Harvest");
}
}
private void AddContextMenuEntry(IMenuOpenedArgs args, uint itemId, uint npcId, EClassJob classJob, string verb)
private void AddContextMenuEntry(IMenuOpenedArgs args, uint itemId, uint npcId, EExtendedClassJob extendedClassJob,
string verb)
{
EClassJob currentClassJob = (EClassJob)_clientState.LocalPlayer!.ClassJob.Id;
EClassJob classJob = ClassJobUtils.AsIndividualJobs(extendedClassJob).Single();
if (classJob != currentClassJob && currentClassJob is EClassJob.Miner or EClassJob.Botanist)
return;
@ -123,19 +125,25 @@ internal sealed class ContextMenuController : IDisposable
Prefix = SeIconChar.Hyadelyn,
PrefixColor = 52,
Name = name,
OnClicked = _ => StartGathering(npcId, itemId, quantityToGather, collectability),
OnClicked = _ => StartGathering(npcId, itemId, quantityToGather, collectability, extendedClassJob),
IsEnabled = string.IsNullOrEmpty(lockedReasonn),
});
}
private void StartGathering(uint npcId, uint itemId, int quantity, ushort collectability)
private void StartGathering(uint npcId, uint itemId, int quantity, ushort collectability,
EExtendedClassJob extendedClassJob)
{
var info = (SatisfactionSupplyInfo)_questData.GetAllByIssuerDataId(npcId)
.Single(x => x is SatisfactionSupplyInfo);
if (_questRegistry.TryGetQuest(info.QuestId, out Quest? quest))
{
var step = quest.FindSequence(0)!.Steps.Single(x => x.InteractionType == EInteractionType.Gather);
step.ItemsToGather =
var sequence = quest.FindSequence(0)!;
var switchClassStep = sequence.Steps.Single(x => x.InteractionType == EInteractionType.SwitchClass);
switchClassStep.TargetClass = extendedClassJob;
var gatherStep = sequence.Steps.Single(x => x.InteractionType == EInteractionType.Gather);
gatherStep.ItemsToGather =
[
new GatheredItem
{

18
Questionable/Controller/Steps/Shared/SwitchClassJob.cs
View File

@ -1,13 +1,27 @@
using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.Game;
using System.Linq;
using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.UI.Misc;
using LLib.GameData;
using Questionable.Controller.Steps.Common;
using Questionable.Data;
using Questionable.Model;
using Questionable.Model.Questing;
namespace Questionable.Controller.Steps.Shared;
internal static class SwitchClassJob
{
internal sealed class Factory : SimpleTaskFactory
{
public override ITask? CreateTask(Quest quest, QuestSequence sequence, QuestStep step)
{
if (step.InteractionType != EInteractionType.SwitchClass)
return null;
EClassJob classJob = ClassJobUtils.AsIndividualJobs(step.TargetClass).Single();
return new Task(classJob);
}
}
internal sealed record Task(EClassJob ClassJob) : ITask
{
public override string ToString() => $"SwitchJob({ClassJob})";

3
Questionable/QuestionablePlugin.cs
View File

@ -137,7 +137,8 @@ public sealed class QuestionablePlugin : IDalamudPlugin
.AddTaskExecutor<MoveToLandingLocation.Task, MoveToLandingLocation.MoveToLandingLocationExecutor>();
serviceCollection.AddTaskExecutor<DoGather.Task, DoGather.GatherExecutor>();
serviceCollection.AddTaskExecutor<DoGatherCollectable.Task, DoGatherCollectable.GatherCollectableExecutor>();
serviceCollection.AddTaskExecutor<SwitchClassJob.Task, SwitchClassJob.SwitchClassJobExecutor>();
serviceCollection.AddTaskFactoryAndExecutor<SwitchClassJob.Task, SwitchClassJob.Factory,
SwitchClassJob.SwitchClassJobExecutor>();
serviceCollection.AddTaskExecutor<Mount.MountTask, Mount.MountExecutor>();
serviceCollection.AddTaskExecutor<Mount.UnmountTask, Mount.UnmountExecutor>();