From 5da04c853b2b7d4d607ab0e62a9fc3b52d36d6e6 Mon Sep 17 00:00:00 2001 From: Moons Date: Wed, 19 Jun 2024 21:22:03 +0200 Subject: [PATCH 1/2] feat(s24): TFS update --- Dockerfile | 4 +- .../Interactions/CraftingCommands.cs | 46 +++- .../Interactions/LookupCommands.cs | 4 +- Felicity/Felicity.csproj | 36 +-- Felicity/Properties/launchSettings.json | 4 +- .../Services/Hosted/DiscordStartupService.cs | 3 + Felicity/Util/Enums/Craftables.cs | 237 ++++++++---------- Felicity/Util/Enums/LootTables.cs | 6 +- 8 files changed, 177 insertions(+), 163 deletions(-) diff --git a/Dockerfile b/Dockerfile index cc159ee..54cc38a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base WORKDIR /app EXPOSE 80 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src COPY ["Felicity/Felicity.csproj", "Felicity/"] RUN dotnet restore "Felicity/Felicity.csproj" diff --git a/Felicity/DiscordCommands/Interactions/CraftingCommands.cs b/Felicity/DiscordCommands/Interactions/CraftingCommands.cs index 2e10681..58b036f 100644 --- a/Felicity/DiscordCommands/Interactions/CraftingCommands.cs +++ b/Felicity/DiscordCommands/Interactions/CraftingCommands.cs @@ -1,10 +1,13 @@ -using System.Text; +using System.Diagnostics.Eventing.Reader; +using System.Text; using Discord; using Discord.Interactions; using DotNetBungieAPI.Extensions; +using DotNetBungieAPI.HashReferences; using DotNetBungieAPI.Models; using DotNetBungieAPI.Models.Authorization; using DotNetBungieAPI.Models.Destiny; +using DotNetBungieAPI.Models.Destiny.Components; using DotNetBungieAPI.Models.Destiny.Definitions.InventoryItems; using DotNetBungieAPI.Models.Destiny.Definitions.Records; using DotNetBungieAPI.Models.Destiny.Responses; @@ -157,11 +160,7 @@ public async Task Recipes( DestinyComponentType.ProfileInventories }, user.GetTokenData()); - var deepDeepsight = await IsDeepsightAvailable(8721509, - user.DestinyMembershipType, user.DestinyMembershipId, user.GetTokenData(), - request.Response.Characters.Data.Keys.First()); - - var wishDeepsight = await IsDeepsightAvailable(1251298789, + var failsafeDeepsight = await IsDeepsightAvailable(DefinitionHashes.Vendors.SeasonalEngramDecoding, user.DestinyMembershipType, user.DestinyMembershipId, user.GetTokenData(), request.Response.Characters.Data.Keys.First()); @@ -203,7 +202,35 @@ public async Task Recipes( _bungieClient.Repository.TryGetDestinyDefinition(weaponId, out var manifestRecord); - var record = request.Response.ProfileRecords.Data.Records[weaponId]; + DestinyRecordComponent? record = null; + var characterWeapons = new List + { + DefinitionHashes.Records.FaithKeeper, + DefinitionHashes.Records.IllOmen, + DefinitionHashes.Records.SightlineSurvey, + DefinitionHashes.Records.TimewornWayfarer, + DefinitionHashes.Records.VeiledThreat + }; + + if (characterWeapons.Contains(weaponId)) + { + foreach (var characterKey in request.Response.Characters.Data.Keys) + { + if (!request.Response.CharacterRecords.Data[characterKey].Records.ContainsKey(weaponId)) + continue; + + record = request.Response.CharacterRecords.Data[characterKey].Records[weaponId]; + break; + } + } + else + { + record = request.Response.ProfileRecords.Data.Records[weaponId]; + } + + if (record == null) + continue; + var obj = record.Objectives.First(); if (obj.IsComplete) @@ -226,7 +253,7 @@ public async Task Recipes( field.Value += $"\n > `{obj.Progress}/{obj.CompletionValue}`"; } - if ((keyValuePair.Key is "Deep" && deepDeepsight) || (keyValuePair.Key is "Wish" && wishDeepsight)) + if (keyValuePair.Key is "Failsafe" && failsafeDeepsight) { if (field.Value.ToString()!.Contains("⚠️")) field.Value += "💰 "; @@ -302,8 +329,7 @@ private async Task IsDeepsightAvailable(uint vendorId, BungieMembershipTyp var categoryIndex = vendorId switch { - 8721509 => 1, - 1251298789 => 1, + 908390552 => 1, _ => 0 }; diff --git a/Felicity/DiscordCommands/Interactions/LookupCommands.cs b/Felicity/DiscordCommands/Interactions/LookupCommands.cs index 31c0e50..6245b46 100644 --- a/Felicity/DiscordCommands/Interactions/LookupCommands.cs +++ b/Felicity/DiscordCommands/Interactions/LookupCommands.cs @@ -266,7 +266,7 @@ private static async Task GenerateLookupEmbed(BungieResponse GenerateLookupEmbed(BungieResponse - net6.0 + net8.0 enable enable 581e6930-6463-4c70-a3cb-9932d090442e @@ -9,25 +9,25 @@ - - + + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + diff --git a/Felicity/Properties/launchSettings.json b/Felicity/Properties/launchSettings.json index 55b609b..c682c2f 100644 --- a/Felicity/Properties/launchSettings.json +++ b/Felicity/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "Felicity": { "commandName": "Project", - "workingDirectory": "bin/Debug/net6.0", + "workingDirectory": "bin/Debug/net8.0", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, @@ -16,7 +16,7 @@ }, "WSL": { "commandName": "WSL2", - "workingDirectory": "{ProjectDir}/bin/Debug/net6.0", + "workingDirectory": "{ProjectDir}/bin/Debug/net8.0", "launchUrl": "https://localhost:4259", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development", diff --git a/Felicity/Services/Hosted/DiscordStartupService.cs b/Felicity/Services/Hosted/DiscordStartupService.cs index 6736724..100f8bd 100644 --- a/Felicity/Services/Hosted/DiscordStartupService.cs +++ b/Felicity/Services/Hosted/DiscordStartupService.cs @@ -214,6 +214,9 @@ private static async Task OnSlashCommandExecuted(SlashCommandInfo arg1, IInterac var errorMessage = $"{result.Error}: {result.ErrorReason}"; + if(result is ExecuteResult eResult) + errorMessage = $"{eResult.Exception.InnerException!.GetType()}: {eResult.Exception.InnerException!.Message}"; + errorEmbed.AddField("Command", $"```{options!.Name}```"); errorEmbed.AddField("Parameters", $"```{JsonSerializer.Serialize(debugOptions)}```"); errorEmbed.AddField("Error", $"```{errorMessage}```"); diff --git a/Felicity/Util/Enums/Craftables.cs b/Felicity/Util/Enums/Craftables.cs index 709455b..6e8afff 100644 --- a/Felicity/Util/Enums/Craftables.cs +++ b/Felicity/Util/Enums/Craftables.cs @@ -8,61 +8,65 @@ internal static class Craftables public static readonly Dictionary> CraftableList = new() { { - CraftSource.SeasonWish, new List - { + CraftSource.SeasonEchoes, [ + DefinitionHashes.Records.FaithKeeper, + DefinitionHashes.Records.IllOmen, + DefinitionHashes.Records.LostSignal, + DefinitionHashes.Records.SightlineSurvey, + DefinitionHashes.Records.TimewornWayfarer, + DefinitionHashes.Records.VeiledThreat + ] + }, + { + CraftSource.SeasonWish, [ DefinitionHashes.Records.Appetence, DefinitionHashes.Records.DoomedPetitioner, DefinitionHashes.Records.Lethophobia, DefinitionHashes.Records.ScalarPotential, DefinitionHashes.Records.ScatterSignal, DefinitionHashes.Records.Supercluster - } + ] }, { - CraftSource.SeasonUndying, new List - { + CraftSource.SeasonUndying, [ DefinitionHashes.Records.Adhortative, DefinitionHashes.Records.Imperative, DefinitionHashes.Records.Subjunctive, DefinitionHashes.Records.Optative - } + ] }, { - CraftSource.RaidCe, new List - { + CraftSource.RaidCe, [ DefinitionHashes.Records.AbyssDefiant, DefinitionHashes.Records.FangofIrYût, DefinitionHashes.Records.OversoulEdict, DefinitionHashes.Records.SongofIrYût, DefinitionHashes.Records.Swordbreaker, DefinitionHashes.Records.WordofCrota - } + ] }, { - CraftSource.SeasonWitch, new List - { + CraftSource.SeasonWitch, [ DefinitionHashes.Records.BryasLove, DefinitionHashes.Records.EleaticPrinciple, DefinitionHashes.Records.TheEremite, DefinitionHashes.Records.KeptConfidence, DefinitionHashes.Records.LocusLocutus, DefinitionHashes.Records.Semiotician - } + ] }, { - CraftSource.SeasonDeep, new List - { + CraftSource.SeasonDeep, [ DefinitionHashes.Records.DifferentTimes, DefinitionHashes.Records.ADistantPull, DefinitionHashes.Records.RapaciousAppetite, DefinitionHashes.Records.TargetedRedaction, DefinitionHashes.Records.ThinPrecipice, DefinitionHashes.Records.UntilItsReturn - } + ] }, { - CraftSource.RaidLw, new List - { + CraftSource.RaidLw, [ DefinitionHashes.Records.AgeOldBond, DefinitionHashes.Records.ApexPredator, DefinitionHashes.Records.ChatteringBone, @@ -71,22 +75,20 @@ internal static class Craftables DefinitionHashes.Records.Transfiguration, DefinitionHashes.Records.TyrannyofHeaven, DefinitionHashes.Records.TheSupremacy - } + ] }, { - CraftSource.RaidRoN, new List - { + CraftSource.RaidRoN, [ DefinitionHashes.Records.AcasiasDejection, DefinitionHashes.Records.BriarsContempt, DefinitionHashes.Records.KoraxissDistress, DefinitionHashes.Records.MykelsReverence, DefinitionHashes.Records.NessasOblation, DefinitionHashes.Records.RufussFury - } + ] }, { - CraftSource.SeasonDefiance, new List - { + CraftSource.SeasonDefiance, [ DefinitionHashes.Records.Caretaker_3171877617, DefinitionHashes.Records.Goldtusk, DefinitionHashes.Records.ImperialDecree, @@ -97,21 +99,19 @@ internal static class Craftables DefinitionHashes.Records.Regnant, DefinitionHashes.Records.RoyalExecutioner, DefinitionHashes.Records.ThroneCleaver - } + ] }, { - CraftSource.Lightfall, new List - { + CraftSource.Lightfall, [ DefinitionHashes.Records.DimensionalHypotrochoid, DefinitionHashes.Records.IterativeLoop, DefinitionHashes.Records.PhyllotacticSpiral, DefinitionHashes.Records.RoundRobin_2839479882, DefinitionHashes.Records.VoltaBracket - } + ] }, { - CraftSource.SeasonSeraph, new List - { + CraftSource.SeasonSeraph, [ DefinitionHashes.Records.Disparity, DefinitionHashes.Records.FireandForget, DefinitionHashes.Records.IKELOS_HC_v103, @@ -122,110 +122,100 @@ internal static class Craftables DefinitionHashes.Records.PathofLeastResistance, DefinitionHashes.Records.RetrofitEscapade, DefinitionHashes.Records.TripwireCanary - } + ] }, { - CraftSource.RaidDsc, new List - { + CraftSource.RaidDsc, [ DefinitionHashes.Records.Bequest, DefinitionHashes.Records.Commemoration, DefinitionHashes.Records.Heritage, DefinitionHashes.Records.Posterity, DefinitionHashes.Records.Succession, DefinitionHashes.Records.Trustee - } + ] }, { - CraftSource.RaidKf, new List - { + CraftSource.RaidKf, [ DefinitionHashes.Records.DefianceofYasmin, DefinitionHashes.Records.DoomofChelchis, DefinitionHashes.Records.MidhasReckoning, DefinitionHashes.Records.QullimsTerminus, DefinitionHashes.Records.SmiteofMerain, DefinitionHashes.Records.ZaoulisBane - } + ] }, { - CraftSource.SeasonPlunder, new List - { + CraftSource.SeasonPlunder, [ DefinitionHashes.Records.BloodFeud, DefinitionHashes.Records.BrigandsLaw, DefinitionHashes.Records.NoReprieve, DefinitionHashes.Records.PlancksStride, DefinitionHashes.Records.SailspyPitchglass, DefinitionHashes.Records.TarnishedMettle - } + ] }, { - CraftSource.Anniversary, new List - { + CraftSource.Anniversary, [ DefinitionHashes.Records.BxR55Battler, DefinitionHashes.Records.HalfTruths, DefinitionHashes.Records.PardonOurDust, DefinitionHashes.Records.RetracedPath, DefinitionHashes.Records.TheOtherHalf, DefinitionHashes.Records.WastelanderM5 - } + ] }, { - CraftSource.Unknown, new List - { + CraftSource.Unknown, [ DefinitionHashes.Records.AmmitAR2, DefinitionHashes.Records.DeadMansTale, DefinitionHashes.Records.DeadMessenger, DefinitionHashes.Records.Taipan4fr, DefinitionHashes.Records.RevisionZero, DefinitionHashes.Records.Vexcalibur - } + ] }, { - CraftSource.SeasonHaunted, new List - { + CraftSource.SeasonHaunted, [ DefinitionHashes.Records.BumpintheNight, DefinitionHashes.Records.Firefright, DefinitionHashes.Records.HollowDenial, DefinitionHashes.Records.NezarecsWhisper, DefinitionHashes.Records.TearsofContrition, DefinitionHashes.Records.WithoutRemorse - } + ] }, { - CraftSource.Opulent, new List - { + CraftSource.Opulent, [ DefinitionHashes.Records.Austringer, DefinitionHashes.Records.Beloved_662547074, DefinitionHashes.Records.CALUSMiniTool, DefinitionHashes.Records.DrangBaroque, DefinitionHashes.Records.FixedOdds, DefinitionHashes.Records.TheEpicurean - } + ] }, { - CraftSource.SeasonRisen, new List - { + CraftSource.SeasonRisen, [ DefinitionHashes.Records.ExplosivePersonality, DefinitionHashes.Records.PieceofMind, DefinitionHashes.Records.RecurrentImpact, DefinitionHashes.Records.SweetSorrow, DefinitionHashes.Records.Thoughtless, DefinitionHashes.Records.UnderYourSkin - } + ] }, { - CraftSource.RaidVotD, new List - { + CraftSource.RaidVotD, [ DefinitionHashes.Records.Cataclysmic, DefinitionHashes.Records.Deliverance, DefinitionHashes.Records.Forbearance, DefinitionHashes.Records.Insidious, DefinitionHashes.Records.LubraesRuin, DefinitionHashes.Records.Submission - } + ] }, { - CraftSource.WqWellspring, new List - { + CraftSource.WqWellspring, [ DefinitionHashes.Records.CometoPass, DefinitionHashes.Records.EdgeofAction, DefinitionHashes.Records.EdgeofConcurrence, @@ -233,11 +223,10 @@ internal static class Craftables DefinitionHashes.Records.FathersSins, DefinitionHashes.Records.FelTaradiddle, DefinitionHashes.Records.Tarnation - } + ] }, { - CraftSource.Wq, new List - { + CraftSource.Wq, [ DefinitionHashes.Records.EmpiricalEvidence, DefinitionHashes.Records.ForensicNightmare, DefinitionHashes.Records.LikelySuspect, @@ -248,68 +237,72 @@ internal static class Craftables DefinitionHashes.Records.RedHerring, DefinitionHashes.Records.Syncopation53, DefinitionHashes.Records.TheEnigma - } + ] } }; public static readonly Dictionary> CraftedList = new() { { - CraftSource.SeasonWish, new List - { + CraftSource.SeasonEchoes, [ + DefinitionHashes.InventoryItems.FaithKeeper_4195186942, + DefinitionHashes.InventoryItems.IllOmen_3794274730, + DefinitionHashes.InventoryItems.LostSignal_1197771438, + DefinitionHashes.InventoryItems.SightlineSurvey_2350330520, + DefinitionHashes.InventoryItems.TimewornWayfarer_1058098236, + DefinitionHashes.InventoryItems.VeiledThreat_3685470415 + ] + }, + { + CraftSource.SeasonWish, [ DefinitionHashes.InventoryItems.Appetence_4153087276, DefinitionHashes.InventoryItems.DoomedPetitioner_1501688142, DefinitionHashes.InventoryItems.Lethophobia_3710082365, DefinitionHashes.InventoryItems.ScalarPotential_2563668388, DefinitionHashes.InventoryItems.ScatterSignal_2558925366, DefinitionHashes.InventoryItems.Supercluster_92459755 - } + ] }, { - CraftSource.SeasonUndying, new List - { + CraftSource.SeasonUndying, [ DefinitionHashes.InventoryItems.Adhortative_2993554824, DefinitionHashes.InventoryItems.Imperative_2045811635, DefinitionHashes.InventoryItems.Subjunctive_1447836603, DefinitionHashes.InventoryItems.Optative_2817683783 - } + ] }, { - CraftSource.RaidCe, new List - { + CraftSource.RaidCe, [ DefinitionHashes.InventoryItems.AbyssDefiant_833898322, DefinitionHashes.InventoryItems.FangofIrYût_1432682459, DefinitionHashes.InventoryItems.OversoulEdict_1098171824, DefinitionHashes.InventoryItems.SongofIrYût_2828278545, DefinitionHashes.InventoryItems.Swordbreaker_3163900678, DefinitionHashes.InventoryItems.WordofCrota_120706239 - } + ] }, { - CraftSource.SeasonWitch, new List - { + CraftSource.SeasonWitch, [ DefinitionHashes.InventoryItems.BryasLove_2779821308, DefinitionHashes.InventoryItems.EleaticPrinciple_105306149, DefinitionHashes.InventoryItems.TheEremite_3347946548, DefinitionHashes.InventoryItems.LocusLocutus_4132072834, DefinitionHashes.InventoryItems.KeptConfidence_1875512595, DefinitionHashes.InventoryItems.Semiotician_2922749929 - } + ] }, { - CraftSource.SeasonDeep, new List - { + CraftSource.SeasonDeep, [ DefinitionHashes.InventoryItems.DifferentTimes_3016891299, DefinitionHashes.InventoryItems.ADistantPull_1769847435, DefinitionHashes.InventoryItems.RapaciousAppetite_1081724548, DefinitionHashes.InventoryItems.TargetedRedaction_3890055324, DefinitionHashes.InventoryItems.ThinPrecipice_4066778670, DefinitionHashes.InventoryItems.UntilItsReturn_2883484461 - } + ] }, { - CraftSource.RaidLw, new List - { + CraftSource.RaidLw, [ DefinitionHashes.InventoryItems.AgeOldBond_424291879, DefinitionHashes.InventoryItems.ApexPredator_1851777734, DefinitionHashes.InventoryItems.ChatteringBone_501329015, @@ -318,22 +311,20 @@ internal static class Craftables DefinitionHashes.InventoryItems.Transfiguration_3885259140, DefinitionHashes.InventoryItems.TyrannyofHeaven_3388655311, DefinitionHashes.InventoryItems.TheSupremacy_2884596447 - } + ] }, { - CraftSource.RaidRoN, new List - { + CraftSource.RaidRoN, [ DefinitionHashes.InventoryItems.AcasiasDejection_1471212226, DefinitionHashes.InventoryItems.BriarsContempt_1491665733, DefinitionHashes.InventoryItems.KoraxissDistress_2972949637, DefinitionHashes.InventoryItems.MykelsReverence_231031173, DefinitionHashes.InventoryItems.NessasOblation_135029084, DefinitionHashes.InventoryItems.RufussFury_484515708 - } + ] }, { - CraftSource.SeasonDefiance, new List - { + CraftSource.SeasonDefiance, [ DefinitionHashes.InventoryItems.Caretaker_2508948099, DefinitionHashes.InventoryItems.DeathsRazor_569799274, DefinitionHashes.InventoryItems.Goldtusk_569799275, @@ -344,21 +335,19 @@ internal static class Craftables DefinitionHashes.InventoryItems.Regnant_268260372, DefinitionHashes.InventoryItems.RoyalExecutioner_1720503118, DefinitionHashes.InventoryItems.ThroneCleaver_569799273 - } + ] }, { - CraftSource.Lightfall, new List - { + CraftSource.Lightfall, [ DefinitionHashes.InventoryItems.DimensionalHypotrochoid_1311684613, DefinitionHashes.InventoryItems.RoundRobin_2034215657, DefinitionHashes.InventoryItems.PhyllotacticSpiral_3635821806, DefinitionHashes.InventoryItems.IterativeLoop_1289796511, DefinitionHashes.InventoryItems.VoltaBracket_3920310144 - } + ] }, { - CraftSource.SeasonSeraph, new List - { + CraftSource.SeasonSeraph, [ DefinitionHashes.InventoryItems.Disparity_1751893422, DefinitionHashes.InventoryItems.FireandForget_2272041093, DefinitionHashes.InventoryItems.IKELOS_HC_v103, @@ -369,110 +358,100 @@ internal static class Craftables DefinitionHashes.InventoryItems.PathofLeastResistance_2827764482, DefinitionHashes.InventoryItems.RetrofitEscapade_3103325054, DefinitionHashes.InventoryItems.TripwireCanary_3849444474 - } + ] }, { - CraftSource.RaidDsc, new List - { + CraftSource.RaidDsc, [ DefinitionHashes.InventoryItems.Bequest_3366545721, DefinitionHashes.InventoryItems.Commemoration_4230965989, DefinitionHashes.InventoryItems.Heritage_4248569242, DefinitionHashes.InventoryItems.Posterity_3281285075, DefinitionHashes.InventoryItems.Succession_2990047042, DefinitionHashes.InventoryItems.Trustee_1392919471 - } + ] }, { - CraftSource.RaidKf, new List - { + CraftSource.RaidKf, [ DefinitionHashes.InventoryItems.DefianceofYasmin_3228096719, DefinitionHashes.InventoryItems.DoomofChelchis_1937552980, DefinitionHashes.InventoryItems.MidhasReckoning_3969066556, DefinitionHashes.InventoryItems.QullimsTerminus_1321506184, DefinitionHashes.InventoryItems.SmiteofMerain_2221264583, DefinitionHashes.InventoryItems.ZaoulisBane_431721920 - } + ] }, { - CraftSource.SeasonPlunder, new List - { + CraftSource.SeasonPlunder, [ DefinitionHashes.InventoryItems.BloodFeud_1509167284, DefinitionHashes.InventoryItems.BrigandsLaw_1298815317, DefinitionHashes.InventoryItems.NoReprieve_2531963421, DefinitionHashes.InventoryItems.PlancksStride_820890091, DefinitionHashes.InventoryItems.SailspyPitchglass_1184309824, DefinitionHashes.InventoryItems.TarnishedMettle_2218569744 - } + ] }, { - CraftSource.Anniversary, new List - { + CraftSource.Anniversary, [ DefinitionHashes.InventoryItems.BxR55Battler_2708806099, DefinitionHashes.InventoryItems.HalfTruths_3257091166, DefinitionHashes.InventoryItems.PardonOurDust_3849810018, DefinitionHashes.InventoryItems.RetracedPath_548958835, DefinitionHashes.InventoryItems.TheOtherHalf_3257091167, DefinitionHashes.InventoryItems.WastelanderM5_1679868061 - } + ] }, { - CraftSource.Unknown, new List - { + CraftSource.Unknown, [ DefinitionHashes.InventoryItems.AmmitAR2_2119346509, 2188764214, 46125926, DefinitionHashes.InventoryItems.RevisionZero_1473821207, DefinitionHashes.InventoryItems.Taipan4fr_1911060537, DefinitionHashes.InventoryItems.Vexcalibur_3118061005 - } + ] }, { - CraftSource.SeasonHaunted, new List - { + CraftSource.SeasonHaunted, [ DefinitionHashes.InventoryItems.BumpintheNight_1959650777, DefinitionHashes.InventoryItems.Firefright_2778013407, DefinitionHashes.InventoryItems.HollowDenial_2323544076, DefinitionHashes.InventoryItems.NezarecsWhisper_254636484, DefinitionHashes.InventoryItems.TearsofContrition_1366394399, DefinitionHashes.InventoryItems.WithoutRemorse_1478986057 - } + ] }, { - CraftSource.Opulent, new List - { + CraftSource.Opulent, [ DefinitionHashes.InventoryItems.Austringer_3055790362, DefinitionHashes.InventoryItems.Beloved_3107853529, DefinitionHashes.InventoryItems.CALUSMiniTool_2490988246, DefinitionHashes.InventoryItems.DrangBaroque_502356570, DefinitionHashes.InventoryItems.FixedOdds_2194955522, DefinitionHashes.InventoryItems.TheEpicurean_2263839058 - } + ] }, { - CraftSource.SeasonRisen, new List - { + CraftSource.SeasonRisen, [ DefinitionHashes.InventoryItems.ExplosivePersonality_4096943616, DefinitionHashes.InventoryItems.PieceofMind_2097055732, DefinitionHashes.InventoryItems.RecurrentImpact_1572896086, DefinitionHashes.InventoryItems.SweetSorrow_1248372789, DefinitionHashes.InventoryItems.Thoughtless_4067556514, DefinitionHashes.InventoryItems.UnderYourSkin_232928045 - } + ] }, { - CraftSource.RaidVotD, new List - { + CraftSource.RaidVotD, [ DefinitionHashes.InventoryItems.Cataclysmic_999767358, DefinitionHashes.InventoryItems.Deliverance_768621510, DefinitionHashes.InventoryItems.Forbearance_613334176, DefinitionHashes.InventoryItems.Insidious_3428521585, DefinitionHashes.InventoryItems.LubraesRuin_2534546147, DefinitionHashes.InventoryItems.Submission_3886416794 - } + ] }, { - CraftSource.WqWellspring, new List - { + CraftSource.WqWellspring, [ DefinitionHashes.InventoryItems.CometoPass_927567426, DefinitionHashes.InventoryItems.EdgeofAction_2535142413, DefinitionHashes.InventoryItems.EdgeofConcurrence_542203595, @@ -480,11 +459,10 @@ internal static class Craftables DefinitionHashes.InventoryItems.FathersSins_3865728990, DefinitionHashes.InventoryItems.FelTaradiddle_1399109800, DefinitionHashes.InventoryItems.Tarnation_2721157927 - } + ] }, { - CraftSource.Wq, new List - { + CraftSource.Wq, [ DefinitionHashes.InventoryItems.EmpiricalEvidence_2607304614, DefinitionHashes.InventoryItems.ForensicNightmare_1526296434, DefinitionHashes.InventoryItems.LikelySuspect_1994645182, @@ -495,7 +473,7 @@ internal static class Craftables DefinitionHashes.InventoryItems.RedHerring_3175851496, DefinitionHashes.InventoryItems.Syncopation53_2856514843, DefinitionHashes.InventoryItems.TheEnigma_2595497736 - } + ] } }; @@ -642,6 +620,12 @@ public static uint GetWeaponId(uint recordDefinitionHash) DefinitionHashes.Records.Goldtusk => DefinitionHashes.InventoryItems.Goldtusk_569799275, DefinitionHashes.Records.ImperialDecree => DefinitionHashes.InventoryItems.ImperialDecree_2919334548, DefinitionHashes.Records.ThroneCleaver => DefinitionHashes.InventoryItems.ThroneCleaver_569799273, + DefinitionHashes.Records.FaithKeeper => DefinitionHashes.InventoryItems.FaithKeeper_4195186942, + DefinitionHashes.Records.IllOmen => DefinitionHashes.InventoryItems.IllOmen_3794274730, + DefinitionHashes.Records.LostSignal => DefinitionHashes.InventoryItems.LostSignal_1197771438, + DefinitionHashes.Records.SightlineSurvey => DefinitionHashes.InventoryItems.SightlineSurvey_2350330520, + DefinitionHashes.Records.TimewornWayfarer => DefinitionHashes.InventoryItems.TimewornWayfarer_1058098236, + DefinitionHashes.Records.VeiledThreat => DefinitionHashes.InventoryItems.VeiledThreat_3685470415, _ => 0 }; } @@ -677,6 +661,7 @@ private static class CraftSource public const string RaidVotD = "Vow of the Disciple"; public const string SeasonDeep = "Deep"; public const string SeasonDefiance = "Defiance"; + public const string SeasonEchoes = "Echoes"; public const string SeasonHaunted = "Haunted"; public const string SeasonPlunder = "Plunder"; public const string SeasonRisen = "Risen"; diff --git a/Felicity/Util/Enums/LootTables.cs b/Felicity/Util/Enums/LootTables.cs index 5784d16..9d2698c 100644 --- a/Felicity/Util/Enums/LootTables.cs +++ b/Felicity/Util/Enums/LootTables.cs @@ -498,7 +498,7 @@ public static class LootTables LootIds = new List { (uint)Armor.Helmet, (uint)Armor.Gloves, (uint)Armor.Boots, - DefinitionHashes.InventoryItems.NoSurvivors_3262192268, + DefinitionHashes.InventoryItems.NoSurvivors, DefinitionHashes.InventoryItems.NewPacificEpitaph, DefinitionHashes.InventoryItems.ColdComfort_839786290 } @@ -509,7 +509,7 @@ public static class LootTables LootIds = new List { (uint)Armor.Gloves, (uint)Armor.Chest, (uint)Armor.Class, - DefinitionHashes.InventoryItems.NoSurvivors_3262192268, + DefinitionHashes.InventoryItems.NoSurvivors, DefinitionHashes.InventoryItems.GreasyLuck, DefinitionHashes.InventoryItems.ColdComfort_839786290 } @@ -520,7 +520,7 @@ public static class LootTables LootIds = new List { DefinitionHashes.InventoryItems.TheNavigator, - DefinitionHashes.InventoryItems.NoSurvivors_3262192268, + DefinitionHashes.InventoryItems.NoSurvivors, DefinitionHashes.InventoryItems.NewPacificEpitaph, DefinitionHashes.InventoryItems.ColdComfort_839786290, DefinitionHashes.InventoryItems.GreasyLuck, From 4dc1d4f4cbbc74007bdb6f26ce8dd36fc256ca12 Mon Sep 17 00:00:00 2001 From: Moons Date: Wed, 19 Jun 2024 21:23:24 +0200 Subject: [PATCH 2/2] ci(git): update build workflow --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6af06ef..be3a0ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: '6.0.x' + dotnet-version: '8.0.x' - name: Restore dependencies run: dotnet restore Felicity/Felicity.csproj