ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-23 00:07:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into interface

Browse source
This commit is contained in:
meli 2019-12-28 10:23:02 -08:00
commit c618626345
12 changed files with 172 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Dalamud/Dalamud.cs
View file

@ -183,7 +183,7 @@ namespace Dalamud {
CommandManager.AddHandler("/xlitem", new CommandInfo(OnItemLinkCommand)
{
HelpMessage = "Link an item by name. Usage: /xlitem <Item name>"
HelpMessage = "Link an item by name. Usage: /xlitem <Item name>. For matching an item exactly, use /xlitem +<Item name>"
});
#if DEBUG
@ -196,7 +196,7 @@ namespace Dalamud {
CommandManager.AddHandler("/xlbonus", new CommandInfo(OnRouletteBonusNotifyCommand)
{
HelpMessage = "Notify when a roulette has a bonus you specified. Usage: /xlitem <roulette name> <role name>"
HelpMessage = "Notify when a roulette has a bonus you specified. Run without parameters for more info. Usage: /xlbonus <roulette name> <role name>"
});
}
@ -396,9 +396,16 @@ namespace Dalamud {
}
private void OnItemLinkCommand(string command, string arguments) {
var exactSearch = false;
if (arguments.StartsWith("+"))
{
exactSearch = true;
arguments = arguments.Substring(1);
}
Task.Run(async () => {
try {
dynamic results = await XivApi.Search(arguments, "Item", 1);
dynamic results = await XivApi.Search(arguments, "Item", 1, exactSearch);
var itemId = (short) results.Results[0].ID;
var itemName = (string)results.Results[0].Name;
@ -473,7 +480,7 @@ namespace Dalamud {
InvalidArgs:
Framework.Gui.Chat.PrintError("Unrecognized arguments.");
Framework.Gui.Chat.Print("Possible values for roulette: leveling, 506070, msq, guildhests, expert, trials, mentor, alliance, normal\n" +
"Possible values for role: tank, dps, healer, all");
"Possible values for role: tank, dps, healer, all, none/reset");
}
private int RouletteSlugToKey(string slug) => slug.ToLower() switch {