[Loot] Fix bug in loot

BAndysc · BAndysc · commit a40c1b1f88bb · 2024-08-30T12:22:28.000+01:00
diff --git a/Modules/WDE.HttpDatabase/Models/MySqlLootEntry.cs b/Modules/WDE.HttpDatabase/Models/MySqlLootEntry.cs
@@ -6,6 +6,7 @@ namespace WDE.HttpDatabase.Models;
 public class JsonLootEntry : ILootEntry
 {
     public LootSourceType SourceType { get; set; }
+    public LootType LootType { get; set; }
     public uint Entry { get; set; }
     public int ItemOrCurrencyId { get; set; }
     public uint Reference { get; set; }
diff --git a/Modules/WDE.LootEditor/Editor/Standalone/StandaloneLootEditorToolBar.axaml b/Modules/WDE.LootEditor/Editor/Standalone/StandaloneLootEditorToolBar.axaml
@@ -22,7 +22,7 @@
     <CompletionComboBox
       IsEnabled="{CompiledBinding CanChangeLootType}"
       SelectedItem="{CompiledBinding LootType, Mode=TwoWay}"
-      controls:Extensions.EnumType="{x:Type database:LootSourceType}" />
+      Items="{CompiledBinding SupportedLootTypes}" />
 
     <Border Width="20" />
 
diff --git a/Modules/WDE.LootEditor/Editor/Standalone/StandaloneLootEditorViewModel.cs b/Modules/WDE.LootEditor/Editor/Standalone/StandaloneLootEditorViewModel.cs
@@ -58,6 +58,8 @@ public LootSourceType LootType
         }
     }
 
+    public IReadOnlyList<LootSourceType> SupportedLootTypes { get; }
+
     [Notify] private bool canChangeLootType = true;
     [Notify] private bool canChangeEntry = true;
     [Notify] private uint solutionEntry;
@@ -192,6 +194,7 @@ public StandaloneLootEditorViewModel(
         ITextDocumentService textDocumentService,
         IParameterFactory parameterFactory,
         ICurrentCoreVersion currentCoreVersion,
+        ILootEditorFeatures lootEditorFeatures,
         PerDatabaseTableLootSolutionItem? solutionItem = null
         )
     {
@@ -202,6 +205,7 @@ public StandaloneLootEditorViewModel(
         this.parameterPickerService = parameterPickerService;
         this.messageBoxService = messageBoxService;
         this.currentCoreVersion = currentCoreVersion;
+        SupportedLootTypes = lootEditorFeatures.SupportedTypes;
         legacyDifficulties[0] = DifficultyViewModel.Legacy(0, "default");
         legacyDifficulties[1] = DifficultyViewModel.Legacy(1, "heroic dung/25 raid");
         legacyDifficulties[2] = DifficultyViewModel.Legacy(2, "10 heroic raid");
diff --git a/Modules/WDE.LootEditor/Editor/ViewModels/LootEditorViewModel.cs b/Modules/WDE.LootEditor/Editor/ViewModels/LootEditorViewModel.cs
@@ -1086,7 +1086,7 @@ private async Task UnloadLoot(LootSourceType type, LootEntry menu)
 
     private IReadOnlyList<LootEntry> Roots => 
         (LootEditingMode == LootEditingMode.PerDatabaseTable) ? PerDatabaseSolutionItems :
-            Loots.Where(x => x.LootSourceType != LootSourceType.Reference || (uint)x.LootEntry == perEntitySolutionItem!.Entry)
+            Loots.Where(x => x.LootSourceType != LootSourceType.Reference || perEntitySolutionItem!.Type == LootSourceType.Reference && (uint)x.LootEntry == perEntitySolutionItem!.Entry)
                 .Select(x => x.LootEntry)
                 .ToList();
     
@@ -1128,7 +1128,7 @@ private bool VerifyDuplicateKeys()
             {
                 var loot = lootGroup.LootItems[lootIndex];
                 loot.IsDuplicate = false;
-                var item = loot.ItemOrCurrencyId.Value;
+                var item = loot.IsReference ? loot.ReferenceEntry : loot.ItemOrCurrencyId.Value;
                 var minPatch = loot.MinPatch.Value;
                 if (!keys.Add((item, minPatch)))
                 {
diff --git a/Modules/WDE.LootEditor/Editor/ViewModels/LootItemViewModel.cs b/Modules/WDE.LootEditor/Editor/ViewModels/LootItemViewModel.cs
@@ -249,6 +249,7 @@ public LootModel ToModel()
             SourceType = Parent.LootSourceType,
             Entry = (uint)Parent.LootEntry,
             ItemOrCurrencyId = (int)ItemOrCurrencyId.Value,
+            LootType = IsReference ? LootType.Reference : LootType.Item,
             Chance = Math.Abs(Chance.Value),
             QuestRequired = Chance.Value < 0,
             LootMode = (uint)LootMode.Value,
diff --git a/Modules/WDE.LootEditor/QueryGenerator/CmangosLootQueryGenerator.cs b/Modules/WDE.LootEditor/QueryGenerator/CmangosLootQueryGenerator.cs
@@ -64,7 +64,7 @@ public IQuery GenerateQuery(IReadOnlyList<LootGroupModel> models)
                     .BulkInsert(group.Items.Select(x => new
                     {
                         entry = x.Loot.Entry,
-                        item = x.Loot.ItemOrCurrencyId,
+                        item = x.Loot.IsReference() && x.Loot.ItemOrCurrencyId == 0 ? (long)x.Loot.Reference : x.Loot.ItemOrCurrencyId,
                         ChanceOrQuestChance = (x.Loot.QuestRequired ? -1 : 1) * x.Loot.Chance,
                         groupid = x.Loot.GroupId,
                         mincountOrRef = x.Loot.IsReference() ? -(int)x.Loot.Reference : x.Loot.MinCount,
diff --git a/Modules/WDE.LootEditor/QueryGenerator/TrinityLootQueryGenerator.cs b/Modules/WDE.LootEditor/QueryGenerator/TrinityLootQueryGenerator.cs
@@ -129,7 +129,7 @@ public IQuery GenerateUpdateLootIds(LootSourceType sourceType, uint solutionEntr
     }
 }
 
-[RequiresCore("TrinityMaster", "TrinityWrath", "Azeroth")]
+[RequiresCore("TrinityWrath", "Azeroth")]
 [AutoRegister]
 [SingleInstance]
 public class TrinityLootQueryGenerator : BaseTrinityLootQueryGenerator
@@ -143,7 +143,7 @@ protected override object CreateDatabaseObjectRow(LootModel x)
         return new
         {
             Entry = x.Loot.Entry,
-            Item = x.Loot.ItemOrCurrencyId,
+            Item = x.Loot.IsReference() && x.Loot.ItemOrCurrencyId == 0 ? (long)x.Loot.Reference : x.Loot.ItemOrCurrencyId,
             Reference = x.Loot.Reference,
             Chance = x.Loot.Chance,
             QuestRequired = x.Loot.QuestRequired,
@@ -156,6 +156,33 @@ protected override object CreateDatabaseObjectRow(LootModel x)
     }
 }
 
+[RequiresCore("TrinityMaster")]
+[AutoRegister]
+[SingleInstance]
+public class TrinityMasterLootQueryGenerator : BaseTrinityLootQueryGenerator
+{
+    public TrinityMasterLootQueryGenerator(IConditionQueryGenerator conditionQueryGenerator, ICurrentCoreVersion currentCoreVersion, ILootEditorFeatures editorFeatures) : base(conditionQueryGenerator, currentCoreVersion, editorFeatures)
+    {
+    }
+
+    protected override object CreateDatabaseObjectRow(LootModel x)
+    {
+        return new
+        {
+            Entry = x.Loot.Entry,
+            Item = x.Loot.LootType == LootType.Reference ? x.Loot.Reference : (long)x.Loot.ItemOrCurrencyId,
+            ItemType = (int)x.Loot.LootType,
+            Chance = x.Loot.Chance,
+            QuestRequired = x.Loot.QuestRequired,
+            LootMode = x.Loot.LootMode,
+            GroupId = x.Loot.GroupId,
+            MinCount = x.Loot.MinCount,
+            MaxCount = x.Loot.MaxCount,
+            Comment = x.Loot.Comment
+        };
+    }
+}
+
 [RequiresCore("TrinityCata")]
 [AutoRegister]
 [SingleInstance]
@@ -170,7 +197,7 @@ protected override object CreateDatabaseObjectRow(LootModel x)
         return new
         {
             Entry = x.Loot.Entry,
-            Item = Math.Abs(x.Loot.ItemOrCurrencyId),
+            Item = x.Loot.IsReference() && x.Loot.ItemOrCurrencyId == 0 ? (long)x.Loot.Reference : Math.Abs(x.Loot.ItemOrCurrencyId),
             IsCurrency = x.Loot.ItemOrCurrencyId < 0,
             Reference = x.Loot.Reference,
             Chance = x.Loot.Chance,
diff --git a/WoWDatabaseEditor.Common/WDE.CMMySqlDatabase/Models/Loot.cs b/WoWDatabaseEditor.Common/WDE.CMMySqlDatabase/Models/Loot.cs
@@ -6,7 +6,9 @@ namespace WDE.CMMySqlDatabase.Models;
 public abstract class BaseLootTemplate : ILootEntry
 {
     public abstract LootSourceType SourceType { get; }
-    
+
+    public LootType LootType => Reference != 0 ? LootType.Reference : LootType.Item;
+
     [PrimaryKey]
     [Column(Name = "entry")]
     public uint Entry { get; set; }
diff --git a/WoWDatabaseEditor.Common/WDE.Common/Database/ILoot.cs b/WoWDatabaseEditor.Common/WDE.Common/Database/ILoot.cs
@@ -2,9 +2,16 @@
 
 namespace WDE.Common.Database;
 
+public enum LootType
+{
+    Item        = 0,
+    Reference   = 1,
+}
+
 public interface ILootEntry
 {
     LootSourceType SourceType { get; }
+    LootType LootType { get; }
     uint Entry { get; }
     int ItemOrCurrencyId { get; }
     uint Reference { get; }
@@ -27,6 +34,7 @@ public interface ITreasureLootEntry { }
 public struct AbstractLootEntry : ILootEntry
 {
     public LootSourceType SourceType { get; set; }
+    public LootType LootType { get; set; }
     public uint Entry { get; set; }
     public int ItemOrCurrencyId { get; set; }
     public uint Reference { get; set; }
@@ -46,6 +54,7 @@ public struct AbstractLootEntry : ILootEntry
     public AbstractLootEntry(ILootEntry x)
     {
         SourceType = x.SourceType;
+        LootType = x.LootType;
         Entry = x.Entry;
         ItemOrCurrencyId = x.ItemOrCurrencyId;
         Reference = x.Reference;
@@ -82,13 +91,13 @@ public struct AbstractLootTemplateName : ILootTemplateName
 public static class LootExtensions
 {
     public static bool IsReference(this ILootEntry entry)
-        => entry.Reference > 0;
+        => entry.LootType == LootType.Reference;
     
     public static bool IsCurrency(this ILootEntry entry)
-        => entry.ItemOrCurrencyId < 0;
-    
+        => entry.LootType == LootType.Item && entry.ItemOrCurrencyId < 0;
+
     public static bool IsItem(this ILootEntry entry)
-        => !entry.IsCurrency();
+        => entry.LootType == LootType.Item && entry.ItemOrCurrencyId >= 0;
 }
 
 public enum LootSourceType
diff --git a/WoWDatabaseEditor.Common/WDE.Common/Database/LootType.cs b/WoWDatabaseEditor.Common/WDE.Common/Database/LootType.cs
diff --git a/WoWDatabaseEditor.Common/WDE.Common/Utils/AsyncAutoCommand.cs b/WoWDatabaseEditor.Common/WDE.Common/Utils/AsyncAutoCommand.cs
@@ -7,6 +7,7 @@
 using Prism.Commands;
 using WDE.Common.Annotations;
 using WDE.Common.Exceptions;
+using WDE.Common.Services;
 using WDE.Common.Services.MessageBox;
 using WDE.Common.Tasks;
 
@@ -46,7 +47,14 @@ public AsyncAutoCommand(Func<Task> execute,
                     {
                         LOG.LogError(e, "Error in {0} at {1}:{2}", caller, callerFile, callerLineNumber);
                     }
-                    onException?.Invoke(e);
+                    if (onException == null)
+                    {
+                        var service = DI.Resolve<IMessageBoxService>();
+                        if (service != null)
+                            GlobalApplication.MainThread.Dispatch(() => CommandExtensions.ShowError(service, e, null));
+                    }
+                    else
+                        onException?.Invoke(e);
                 },
                 continueOnCapturedContext);
         }
@@ -116,7 +124,14 @@ public AsyncAutoCommand([NotNull]
                 e =>
                 {
                     IsBusy = false;
-                    onException?.Invoke(e);
+                    if (onException == null)
+                    {
+                        var service = DI.Resolve<IMessageBoxService>();
+                        if (service != null)
+                            GlobalApplication.MainThread.Dispatch(() => CommandExtensions.ShowError(service, e, null));
+                    }
+                    else
+                        onException?.Invoke(e);
                 },
                 continueOnCapturedContext);
         }
@@ -290,7 +305,7 @@ public static IAsyncCommand<R> WrapMessageBox<T, R>(this IAsyncCommand<R> cmd, I
             });
         }
 
-        private static async Task ShowError(IMessageBoxService messageBoxService, Exception e, string? header,
+        internal static async Task ShowError(IMessageBoxService messageBoxService, Exception e, string? header,
             [CallerMemberName] string? caller = null,
             [CallerFilePath] string? callerFile = null,
             [CallerLineNumber] int? callerLineNumber = null)
diff --git a/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Database/TrinityMasterMySqlDatabaseProvider.cs b/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Database/TrinityMasterMySqlDatabaseProvider.cs
diff --git a/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/Databases/TrinityMasterDatabase.cs b/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/Databases/TrinityMasterDatabase.cs
diff --git a/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/MySqlLootEntry.cs b/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/MySqlLootEntry.cs
diff --git a/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/MySqlLootEntryMaster.cs b/WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/MySqlLootEntryMaster.cs

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ namespace WDE.HttpDatabase.Models;`
`6`	`6`	`public class JsonLootEntry : ILootEntry`
`7`	`7`	`{`
`8`	`8`	`public LootSourceType SourceType { get; set; }`
	`9`	`+ public LootType LootType { get; set; }`
`9`	`10`	`public uint Entry { get; set; }`
`10`	`11`	`public int ItemOrCurrencyId { get; set; }`
`11`	`12`	`public uint Reference { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@ public LootSourceType LootType`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
	`61`	`+ public IReadOnlyList<LootSourceType> SupportedLootTypes { get; }`
	`62`	`+`
`61`	`63`	`[Notify] private bool canChangeLootType = true;`
`62`	`64`	`[Notify] private bool canChangeEntry = true;`
`63`	`65`	`[Notify] private uint solutionEntry;`
`@@ -192,6 +194,7 @@ public StandaloneLootEditorViewModel(`
`192`	`194`	`ITextDocumentService textDocumentService,`
`193`	`195`	`IParameterFactory parameterFactory,`
`194`	`196`	`ICurrentCoreVersion currentCoreVersion,`
	`197`	`+ ILootEditorFeatures lootEditorFeatures,`
`195`	`198`	`PerDatabaseTableLootSolutionItem? solutionItem = null`
`196`	`199`	`)`
`197`	`200`	`{`
`@@ -202,6 +205,7 @@ public StandaloneLootEditorViewModel(`
`202`	`205`	`this.parameterPickerService = parameterPickerService;`
`203`	`206`	`this.messageBoxService = messageBoxService;`
`204`	`207`	`this.currentCoreVersion = currentCoreVersion;`
	`208`	`+ SupportedLootTypes = lootEditorFeatures.SupportedTypes;`
`205`	`209`	`legacyDifficulties[0] = DifficultyViewModel.Legacy(0, "default");`
`206`	`210`	`legacyDifficulties[1] = DifficultyViewModel.Legacy(1, "heroic dung/25 raid");`
`207`	`211`	`legacyDifficulties[2] = DifficultyViewModel.Legacy(2, "10 heroic raid");`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public IQuery GenerateQuery(IReadOnlyList<LootGroupModel> models)`
`64`	`64`	`.BulkInsert(group.Items.Select(x => new`
`65`	`65`	`{`
`66`	`66`	`entry = x.Loot.Entry,`
`67`		`- item = x.Loot.ItemOrCurrencyId,`
	`67`	`+ item = x.Loot.IsReference() && x.Loot.ItemOrCurrencyId == 0 ? (long)x.Loot.Reference : x.Loot.ItemOrCurrencyId,`
`68`	`68`	`ChanceOrQuestChance = (x.Loot.QuestRequired ? -1 : 1) * x.Loot.Chance,`
`69`	`69`	`groupid = x.Loot.GroupId,`
`70`	`70`	`mincountOrRef = x.Loot.IsReference() ? -(int)x.Loot.Reference : x.Loot.MinCount,`