Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	ZodiacBuddy/BonusLight/BonusLightDuty.cs
#	ZodiacBuddy/ConfigWindow.cs
  • Loading branch information
MidoriKami committed Jul 14, 2024
2 parents 5221944 + f5f11ae commit c19ec17
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 3 deletions.
12 changes: 9 additions & 3 deletions ZodiacBuddy/BonusLight/BonusLightDuty.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class BonusLightDuty {
{ 292, new BonusLightDuty( 292, 16) }, // the Bowl of Embers (Hard)
{ 294, new BonusLightDuty( 294, 16) }, // the Howling Eye (Hard)
{ 293, new BonusLightDuty( 293, 16) }, // the Navel (Hard)
{ 207, new BonusLightDuty( 207, 16) }, // Thornmarch (Hard)
{ 1067, new BonusLightDuty(1067, 16) }, // Thornmarch (Hard)
{ 281, new BonusLightDuty( 281, 16) }, // the Whorleater (Hard)
{ 374, new BonusLightDuty( 374, 16) }, // the Striking Tree (Hard)
{ 377, new BonusLightDuty( 377, 16) }, // the Akh Afah Amphitheatre (Hard)
Expand Down Expand Up @@ -77,10 +77,10 @@ public class BonusLightDuty {
{ 361, new BonusLightDuty( 361, 48) }, // Hullbreaker Isle
{ 373, new BonusLightDuty( 373, 48) }, // the Tam–Tara Deepcroft (Hard)
{ 365, new BonusLightDuty( 365, 48) }, // the Stone Vigil (Hard)
{ 371, new BonusLightDuty( 371, 48) }, // Snowcloak
{ 1062, new BonusLightDuty(1062, 48) }, // Snowcloak
{ 387, new BonusLightDuty( 387, 48) }, // Sastasha (Hard)
{ 367, new BonusLightDuty( 367, 48) }, // the Sunken Temple of Qarn (Hard)
{ 150, new BonusLightDuty( 150, 48) }, // the Keeper of the Lake
{ 1063, new BonusLightDuty(1063, 48) }, // the Keeper of the Lake
{ 188, new BonusLightDuty( 188, 48) }, // the Wanderer's Palace (Hard)
{ 189, new BonusLightDuty( 189, 48) }, // Amdapor Keep (Hard)

Expand Down Expand Up @@ -130,4 +130,10 @@ public static BonusLightDuty GetValue(uint territoryId)
/// <returns>True if the duty was found, otherwise false.</returns>
public static bool TryGetValue(uint territoryId, out BonusLightDuty? duty)
=> Dataset.TryGetValue(territoryId, out duty);

/// <summary>
/// Gets BonusLightDuty list.
/// </summary>
/// <returns>Dataset of the BonusLightDuty.</returns>
public static Dictionary<uint, BonusLightDuty> GetDataset() => Dataset;
}
37 changes: 37 additions & 0 deletions ZodiacBuddy/DebugTools.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
using Dalamud.Game.Text;
using Dalamud.Game.Text.SeStringHandling;
using ZodiacBuddy.BonusLight;

namespace ZodiacBuddy
{
/// <summary>
/// Static class used to store debug and check functions for dev.
/// </summary>
public static class DebugTools
{
/// <summary>
/// Check that all the territory id have a name in Lumina.
/// <p/>
/// If a territory doesn't have a name, it's id have probably changed and a message is display in chat.
/// </summary>
public static void CheckBonusLightDutyTerritories()
{
foreach (var bonusLightDuty in BonusLightDuty.GetDataset())
{
if (string.IsNullOrWhiteSpace(bonusLightDuty.Value.DutyName))
{
var sb = new SeStringBuilder()
.AddUiForeground(45)
.AddText("[ZodiacBuddy] ")
.AddUiForegroundOff()
.Append($"Invalid territory id {bonusLightDuty.Key}");
Service.ChatGui.Print(new XivChatEntry
{
Type = XivChatType.Echo,
Message = sb.BuiltString,
});
}
}
}
}
}

0 comments on commit c19ec17

Please sign in to comment.