ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-30 20:33:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of https://github.com/goatcorp/Dalamud

Browse source
This commit is contained in:
goaaats 2022-01-12 18:19:36 +01:00
commit af4a25c74b
No known key found for this signature in database
GPG key ID: F18F057873895461
6 changed files with 38 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Dalamud/Game/ClientState/Conditions/ConditionFlag.cs
View file

@ -449,5 +449,20 @@ namespace Dalamud.Game.ClientState.Conditions
/// Unable to execute command while bound by duty.
/// </summary>
BoundByDuty95 = 95,
/// <summary>
/// Cannot execute at this time.
/// </summary>
Unknown96 = 96,
/// <summary>
/// Unable to execute command while wearing a guise.
/// </summary>
Disguised = 97,
/// <summary>
/// Unable to execute command while recruiting for a non-cross-world party.
/// </summary>
RecruitingWorldOnly = 98,
}
}

12
Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs
View file

@ -15,14 +15,14 @@ namespace Dalamud.Game.ClientState.JobGauge.Enums
/// </summary>
COEURL = 1,
/// <summary>
/// The Raptor chakra.
/// </summary>
RAPTOR = 2,
/// <summary>
/// The Opo-Opo chakra.
/// </summary>
OPOOPO = 3,
OPOOPO = 2,
/// <summary>
/// The Raptor chakra.
/// </summary>
RAPTOR = 3,
}
}

2
Dalamud/Game/ClientState/JobGauge/Types/SCHGauge.cs
View file

@ -29,7 +29,7 @@ namespace Dalamud.Game.ClientState.JobGauge.Types
public byte FairyGauge => this.Struct->FairyGauge;
/// <summary>
/// Gets the Seraph time remaiSCHg in milliseconds.
/// Gets the remaining time Seraph is active in milliseconds.
/// </summary>
public short SeraphTimer => this.Struct->SeraphTimer;

16
Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs
View file

@ -63,6 +63,7 @@ namespace Dalamud.Interface.Internal.Windows
private string feedbackModalContact = string.Empty;
private bool feedbackModalIncludeException = false;
private PluginManifest? feedbackPlugin = null;
private bool feedbackIsTesting = false;
private int updatePluginCount = 0;
private List<PluginUpdateStatus>? updatedPlugins;
@ -424,7 +425,7 @@ namespace Dalamud.Interface.Internal.Windows
{
if (this.feedbackPlugin != null)
{
Task.Run(async () => await BugBait.SendFeedback(this.feedbackPlugin, this.feedbackModalBody, this.feedbackModalContact, this.feedbackModalIncludeException))
Task.Run(async () => await BugBait.SendFeedback(this.feedbackPlugin, this.feedbackIsTesting, this.feedbackModalBody, this.feedbackModalContact, this.feedbackModalIncludeException))
.ContinueWith(
t =>
{
@ -1237,7 +1238,7 @@ namespace Dalamud.Interface.Internal.Windows
if (!manifest.SourceRepo.IsThirdParty && manifest.AcceptsFeedback)
{
this.DrawSendFeedbackButton(manifest);
this.DrawSendFeedbackButton(manifest, false);
}
ImGuiHelpers.ScaledDummy(5);
@ -1455,14 +1456,18 @@ namespace Dalamud.Interface.Internal.Windows
if (canFeedback)
{
this.DrawSendFeedbackButton(plugin.Manifest);
this.DrawSendFeedbackButton(plugin.Manifest, plugin.IsTesting);
}
if (availablePluginUpdate != default)
this.DrawUpdateSinglePluginButton(availablePluginUpdate);
ImGui.SameLine();
ImGui.TextColored(ImGuiColors.DalamudGrey3, $" v{plugin.Manifest.AssemblyVersion}");
var version = plugin.AssemblyName?.Version;
version ??= plugin.Manifest.Testing
? plugin.Manifest.TestingAssemblyVersion
: plugin.Manifest.AssemblyVersion;
ImGui.TextColored(ImGuiColors.DalamudGrey3, $" v{version}");
if (plugin.IsDev)
{
@ -1684,13 +1689,14 @@ namespace Dalamud.Interface.Internal.Windows
}
}
private void DrawSendFeedbackButton(PluginManifest manifest)
private void DrawSendFeedbackButton(PluginManifest manifest, bool isTesting)
{
ImGui.SameLine();
if (ImGuiComponents.IconButton(FontAwesomeIcon.Comment))
{
this.feedbackPlugin = manifest;
this.feedbackModalOnNextFrame = true;
this.feedbackIsTesting = isTesting;
}
if (ImGui.IsItemHovered())

4
Dalamud/Support/BugBait.cs
View file

@ -23,7 +23,7 @@ namespace Dalamud.Support
/// <param name="reporter">The reporter name.</param>
/// <param name="includeException">Whether or not the most recent exception to occur should be included in the report.</param>
/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
public static async Task SendFeedback(PluginManifest plugin, string content, string reporter, bool includeException)
public static async Task SendFeedback(PluginManifest plugin, bool isTesting, string content, string reporter, bool includeException)
{
if (content.IsNullOrWhitespace())
return;
@ -33,7 +33,7 @@ namespace Dalamud.Support
Content = content,
Reporter = reporter,
Name = plugin.InternalName,
Version = plugin.AssemblyVersion.ToString(),
Version = isTesting ? plugin.TestingAssemblyVersion?.ToString() : plugin.AssemblyVersion.ToString(),
DalamudHash = Util.GetGitHash(),
};

3
README.md
View file

@ -8,6 +8,9 @@ Dalamud is a plugin development framework for FINAL FANTASY XIV that provides ac
It is meant to be used in conjunction with [FFXIVQuickLauncher](https://github.com/goatcorp/FFXIVQuickLauncher), which manages and launches Dalamud for you. __It is generally not recommended for users to try to run Dalamud manually as there are multiple dependencies and assumed folder paths.__
## Hold Up!
If you are just trying to **use** Dalamud, you don't need to do anything on this page - please [download XIVLauncher](https://goatcorp.github.io/) from its official page and follow the setup instructions.
## Plugin development
Dalamud features a growing API for in-game plugin development with game data and chat access and overlays.
Please see our [Developer FAQ](https://goatcorp.github.io/faq/development) and the [API documentation](https://goatcorp.github.io/Dalamud/api/index.html) for more details.