diff --git a/AATool/Data/Objectives/Complex/HeavyCore.cs b/AATool/Data/Objectives/Complex/HeavyCore.cs index a6a25a1..01afdf9 100644 --- a/AATool/Data/Objectives/Complex/HeavyCore.cs +++ b/AATool/Data/Objectives/Complex/HeavyCore.cs @@ -4,26 +4,26 @@ namespace AATool.Data.Objectives.Complex { public class HeavyCore : ComplexObjective { - public const string MaceRecipe = "minecraft:recipes/combat/mace"; + public const string HeavyCoreId = "minecraft:heavy_core"; public const string MaceId = "minecraft:mace"; - public const string BreezeRodId = "minecraft:breeze_rod"; + public const string OminousTrialKeyId = "minecraft:ominous_trial_key"; public const string OverOverkillAdvancement = "minecraft:adventure/overoverkill"; public bool ObtainedHeavyCore { get; private set; } - public bool ObtainedBreezeRod { get; private set; } public bool MaceCrafted { get; private set; } public bool OverOverkillComplete { get; private set; } + public int OminousVaultsOpened { get; private set; } protected override void UpdateAdvancedState(ProgressState progress) { - this.ObtainedHeavyCore = progress.ObtainedHeavyCore; - - this.ObtainedBreezeRod = progress.WasPickedUp(BreezeRodId); + this.ObtainedHeavyCore = progress.WasPickedUp(HeavyCoreId); this.MaceCrafted = progress.WasCrafted(MaceId); this.OverOverkillComplete = progress.AdvancementCompleted(OverOverkillAdvancement); + this.OminousVaultsOpened = progress.TimesUsed(OminousTrialKeyId); + this.Partial = !this.OverOverkillComplete; this.CompletionOverride = this.OverOverkillComplete || this.MaceCrafted || this.ObtainedHeavyCore; } @@ -31,9 +31,9 @@ protected override void UpdateAdvancedState(ProgressState progress) protected override void ClearAdvancedState() { this.ObtainedHeavyCore = false; - this.ObtainedBreezeRod = false; this.MaceCrafted = false; this.OverOverkillComplete = false; + this.OminousVaultsOpened = 0; } protected override string GetShortStatus() @@ -59,7 +59,7 @@ protected override string GetLongStatus() return "Mace\nCrafted"; if (this.ObtainedHeavyCore) - return "Obtained\nHeavy\0Core"; + return $"Obtained\nVaults:\0{this.OminousVaultsOpened}"; return "Obtain\nHeavy\0Core"; } diff --git a/AATool/Data/Progress/Contribution.cs b/AATool/Data/Progress/Contribution.cs index 521d963..d9f8c91 100644 --- a/AATool/Data/Progress/Contribution.cs +++ b/AATool/Data/Progress/Contribution.cs @@ -18,8 +18,6 @@ public Contribution(Uuid Player) : base() public Contribution(NetworkContribution network) : this(network.UUID) { this.Player = new Uuid(network.UUID.String); - this.ObtainedGodApple = network.ObtainedGodApple; - this.ObtainedHeavyCore = network.ObtainedHeavyCore; //add advancements foreach (KeyValuePair advancement in network.Advancements) diff --git a/AATool/Data/Progress/NetworkContribution.cs b/AATool/Data/Progress/NetworkContribution.cs index 2f145a2..b606aa3 100644 --- a/AATool/Data/Progress/NetworkContribution.cs +++ b/AATool/Data/Progress/NetworkContribution.cs @@ -24,7 +24,6 @@ public class NetworkContribution [JsonProperty] public Dictionary Kill { get; set; } [JsonProperty] public bool ObtainedGodApple { get; set; } - [JsonProperty] public bool ObtainedHeavyCore { get; set; } [JsonIgnore] private static readonly HashSet TrackedStats = new () { @@ -69,7 +68,6 @@ public NetworkContribution(Contribution contribution) : this() { this.UUID = contribution.Player; this.ObtainedGodApple = contribution.ObtainedGodApple; - this.ObtainedHeavyCore = contribution.ObtainedHeavyCore; //add advancements foreach (KeyValuePair advancement in contribution.Advancements) diff --git a/AATool/Data/Progress/ProgressState.cs b/AATool/Data/Progress/ProgressState.cs index 59256e3..f74b0e4 100644 --- a/AATool/Data/Progress/ProgressState.cs +++ b/AATool/Data/Progress/ProgressState.cs @@ -23,7 +23,6 @@ public abstract class ProgressState public double KilometersFlown { get; set; } public bool ObtainedGodApple { get; set; } - public bool ObtainedHeavyCore { get; set; } public bool ObtainedLapis { get; set; } public int Deaths { get; set; } diff --git a/AATool/Data/Progress/WorldState.cs b/AATool/Data/Progress/WorldState.cs index 758b8ee..f94d06f 100644 --- a/AATool/Data/Progress/WorldState.cs +++ b/AATool/Data/Progress/WorldState.cs @@ -49,8 +49,6 @@ public WorldState(NetworkState state) : this() //enchanted golden apple this.ObtainedGodApple |= contribution.ObtainedGodApple; - //heavy core - this.ObtainedHeavyCore |= contribution.ObtainedHeavyCore; //lapis this.ObtainedLapis |= contribution.ObtainedLapis; } diff --git a/AATool/Properties/AssemblyInfo.cs b/AATool/Properties/AssemblyInfo.cs index a6529d8..fee47d8 100644 --- a/AATool/Properties/AssemblyInfo.cs +++ b/AATool/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.7.4.0")] -[assembly: AssemblyFileVersion("1.7.4.0")] +[assembly: AssemblyVersion("1.7.4.1")] +[assembly: AssemblyFileVersion("1.7.4.1")] [assembly: NeutralResourcesLanguage("en")] diff --git a/AATool/Saves/AdvancementsFolder.cs b/AATool/Saves/AdvancementsFolder.cs index 45063e3..db2f439 100644 --- a/AATool/Saves/AdvancementsFolder.cs +++ b/AATool/Saves/AdvancementsFolder.cs @@ -94,13 +94,6 @@ protected override void Update(JsonStream json, WorldState state, Contribution c contribution.ObtainedGodApple = true; } - //detect heavy core from vault using mace recipe - if (this.TryGetCompletionOf(HeavyCore.MaceRecipe, json, out _)) - { - state.ObtainedHeavyCore = true; - contribution.ObtainedHeavyCore = true; - } - foreach (var recipe in ArmorTrims.Recipes) { //detect collection of armor trims