From 3e39f47498a82c52a96d521843bf0e1b43856ce3 Mon Sep 17 00:00:00 2001 From: ErebusEtherie Date: Mon, 29 Jun 2020 20:50:43 +0200 Subject: [PATCH] Added Elderslayers influence; added Rune Dagger basetype --- CustomItem.cs | 9 +++++++++ PickIt.cs | 32 ++++++++++++++++++++++++++++++-- PickItSettings.cs | 8 ++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/CustomItem.cs b/CustomItem.cs index 097431d..67dc9e2 100644 --- a/CustomItem.cs +++ b/CustomItem.cs @@ -106,6 +106,7 @@ public CustomItem(LabelOnGround item, FilesContainer fs, float distance, Diction "Bow", "Claw", "Dagger", + "Rune Dagger", "Sceptre", "Staff", "Wand" @@ -122,6 +123,10 @@ public CustomItem(LabelOnGround item, FilesContainer fs, float distance, Diction var @base = GroundItem.GetComponent(); IsElder = @base.isElder; IsShaper = @base.isShaper; + IsHunter = @base.isHunter; + IsRedeemer = @base.isRedeemer; + IsCrusader = @base.isCrusader; + IsWarlord = @base.isWarlord; } if (GroundItem.HasComponent()) @@ -161,6 +166,10 @@ public CustomItem(LabelOnGround item, FilesContainer fs, float distance, Diction public bool IsIdentified { get; } public bool IsRGB { get; } public bool IsShaper { get; } + public bool IsHunter { get; } + public bool IsRedeemer { get; } + public bool IsCrusader { get; } + public bool IsWarlord { get; } public bool IsWeapon { get; } public int ItemLevel { get; } public int LargestLink { get; } diff --git a/PickIt.cs b/PickIt.cs index 3765cf5..ee531c7 100644 --- a/PickIt.cs +++ b/PickIt.cs @@ -280,6 +280,34 @@ public bool OverrideChecks(CustomItem item) #endregion + #region Influenced + + if (Settings.HunterItems) + { + if (item.IsHunter) + return true; + } + + if (Settings.RedeemerItems) + { + if (item.IsRedeemer) + return true; + } + + if (Settings.CrusaderItems) + { + if (item.IsCrusader) + return true; + } + + if (Settings.WarlordItems) + { + if (item.IsWarlord) + return true; + } + + #endregion + #region Rare Overrides if (Settings.Rares && item.Rarity == ItemRarity.Rare) @@ -419,14 +447,14 @@ public bool DoWePickThis(CustomItem itemEntity) #endregion - #region Metamorph edit + #region Metamorph if (itemEntity.IsMetaItem) { pickItemUp = true; } - #endregion + #endregion return pickItemUp; } diff --git a/PickItSettings.cs b/PickItSettings.cs index d3b59cc..ce0569d 100644 --- a/PickItSettings.cs +++ b/PickItSettings.cs @@ -32,6 +32,10 @@ public PickItSettings() GroundChests = new ToggleNode(false); ShaperItems = new ToggleNode(true); ElderItems = new ToggleNode(true); + HunterItems = new ToggleNode(true); + RedeemerItems = new ToggleNode(true); + CrusaderItems = new ToggleNode(true); + WarlordItems = new ToggleNode(true); FracturedItems = new ToggleNode(true); Rares = new ToggleNode(true); RareJewels = new ToggleNode(true); @@ -73,6 +77,10 @@ public PickItSettings() public RangeNode ExtraDelay { get; set; } public ToggleNode ShaperItems { get; set; } public ToggleNode ElderItems { get; set; } + public ToggleNode HunterItems { get; set; } + public ToggleNode CrusaderItems { get; set; } + public ToggleNode WarlordItems { get; set; } + public ToggleNode RedeemerItems { get; set; } public ToggleNode FracturedItems { get; set; } public ToggleNode Rares { get; set; } public ToggleNode RareJewels { get; set; }