diff --git a/MixItUp.Base/Model/Currency/InventoryModel.cs b/MixItUp.Base/Model/Currency/InventoryModel.cs index 73a44a39a..997fa0c2d 100644 --- a/MixItUp.Base/Model/Currency/InventoryModel.cs +++ b/MixItUp.Base/Model/Currency/InventoryModel.cs @@ -189,6 +189,9 @@ public InventoryModel() [JsonIgnore] public string UniqueItemsTotalSpecialIdentifier { get { return string.Format("{0}uniqueitemstotal", this.SpecialIdentifier); } } + [JsonIgnore] + public string AllItemsSpecialIdentifier { get { return string.Format("{0}allitems", this.SpecialIdentifier); } } + [JsonIgnore] public string RandomItemSpecialIdentifier { get { return string.Format("{0}randomitem", this.SpecialIdentifier); } } diff --git a/MixItUp.Base/Util/SpecialIdentifierStringBuilder.cs b/MixItUp.Base/Util/SpecialIdentifierStringBuilder.cs index 1f1c29027..ee24ea883 100644 --- a/MixItUp.Base/Util/SpecialIdentifierStringBuilder.cs +++ b/MixItUp.Base/Util/SpecialIdentifierStringBuilder.cs @@ -831,6 +831,11 @@ await this.ReplaceNumberBasedRegexSpecialIdentifier(RandomNumberRegexSpecialIden { this.ReplaceSpecialIdentifier(inventory.UniqueItemsTotalSpecialIdentifier, inventory.Items.Count().ToString()); } + + if (this.ContainsSpecialIdentifier(inventory.AllItemsSpecialIdentifier)) + { + this.ReplaceSpecialIdentifier(inventory.AllItemsSpecialIdentifier, string.Join(", ", inventory.Items.Values.Select(i => i.Name))); + } } if (this.ContainsSpecialIdentifier(UnicodeRegexSpecialIdentifier))