Add the effects field even if there is no effect

Lounek09 · Oct 23, 2024 · 61d4ed3 · 61d4ed3
1 parent b3c2569
commit 61d4ed3
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 21 deletions.
diff --git a/Cyberia.Salamandra/Commands/Dofus/Incarnation/IncarnationMessageBuilder.cs b/Cyberia.Salamandra/Commands/Dofus/Incarnation/IncarnationMessageBuilder.cs
@@ -3,7 +3,6 @@
 using Cyberia.Api.Data.Incarnations;
 using Cyberia.Api.Data.Items;
 using Cyberia.Api.Data.Spells;
-using Cyberia.Api.Factories.Effects;
 using Cyberia.Salamandra.Commands.Dofus.Item;
 using Cyberia.Salamandra.Commands.Dofus.Spell;
 using Cyberia.Salamandra.Enums;
@@ -100,11 +99,8 @@ private async Task<DiscordEmbedBuilder> EmbedBuilder()
                     Translation.Get<BotTranslations>("Embed.Field.ItemType.Title", _culture), _itemData.GetItemTypeName(_culture), true)
                 .AddEmptyField(true);
 
-            IEnumerable<IEffect> effects = _incarnationData.GetRealEffects();
-            if (effects.Any())
-            {
-                embed.AddEffectFields(Translation.Get<BotTranslations>("Embed.Field.Effects.Title", _culture), effects, true, _culture);
-            }
+            var effects = _incarnationData.GetRealEffects();
+            embed.AddEffectFields(Translation.Get<BotTranslations>("Embed.Field.Effects.Title", _culture), effects, true, _culture);
 
             if (_itemData.WeaponData is not null)
             {

diff --git a/Cyberia.Salamandra/Commands/Dofus/Item/ItemMessageBuilder.cs b/Cyberia.Salamandra/Commands/Dofus/Item/ItemMessageBuilder.cs
@@ -116,10 +116,8 @@ private async Task<DiscordEmbedBuilder> EmbedBuilder()
             embed.AddField(Translation.Get<BotTranslations>("Embed.Field.ItemSet.Title", _culture), _itemSetData.Name.ToString(_culture), true);
         }
 
-        if (_itemStatsData is not null)
-        {
-            embed.AddEffectFields(Translation.Get<BotTranslations>("Embed.Field.ItemSet.Title", _culture), _itemStatsData.Effects, true, _culture);
-        }
+        var effects = _itemStatsData?.Effects ?? Enumerable.Empty<IEffect>();
+        embed.AddEffectFields(Translation.Get<BotTranslations>("Embed.Field.ItemSet.Title", _culture), effects, true, _culture);
 
         if (_itemData.Criteria.Count > 0)
         {

diff --git a/Cyberia.Salamandra/Commands/Dofus/ItemSet/ItemSetMessageBuilder.cs b/Cyberia.Salamandra/Commands/Dofus/ItemSet/ItemSetMessageBuilder.cs
@@ -113,10 +113,7 @@ private Task<DiscordEmbedBuilder> EmbedBuilder()
         }
 
         var effects = _itemSetData.GetEffects(_nbItemSelected);
-        if (effects.Count > 0)
-        {
-            embed.AddEffectFields(Translation.Get<BotTranslations>("Embed.Field.Effects.Title", _culture), effects, true, _culture);
-        }
+        embed.AddEffectFields(Translation.Get<BotTranslations>("Embed.Field.Effects.Title", _culture), effects, true, _culture);
 
         return Task.FromResult(embed);
     }

diff --git a/Cyberia.Salamandra/Commands/Dofus/Spell/SpellMessageBuilder.cs b/Cyberia.Salamandra/Commands/Dofus/Spell/SpellMessageBuilder.cs
@@ -146,11 +146,7 @@ private async Task<DiscordEmbedBuilder> EmbedBuilder()
             }
             else
             {
-                var effects = _spellLevelData.Effects;
-                if (effects.Count > 0)
-                {
-                    embed.AddEffectFields(Translation.Get<BotTranslations>("Embed.Field.Effects.Title", _culture), effects, false, _culture);
-                }
+                embed.AddEffectFields(Translation.Get<BotTranslations>("Embed.Field.Effects.Title", _culture), _spellLevelData.Effects, false, _culture);
 
                 var trapEffects = _spellLevelData.GetTrapEffects();
                 if (trapEffects.Count > 0)

diff --git a/Cyberia.Salamandra/Extensions/DSharpPlus/DiscordEmbedBuilderExtensions.cs b/Cyberia.Salamandra/Extensions/DSharpPlus/DiscordEmbedBuilderExtensions.cs
@@ -69,8 +69,13 @@ public static DiscordEmbedBuilder AddFields(this DiscordEmbedBuilder embed, stri
 
     public static DiscordEmbedBuilder AddEffectFields(this DiscordEmbedBuilder embed, string name, IEnumerable<IEffect> effects, bool sort, CultureInfo? culture, bool inline = false)
     {
-        var effectsParse = GetEffectsParse(effects, sort, culture, x => Formatter.Bold(Formatter.Sanitize(x)));
-        return embed.AddFields(name, effectsParse, inline);
+        if (effects.Any())
+        {
+            var effectsParse = GetEffectsParse(effects, sort, culture, x => Formatter.Bold(Formatter.Sanitize(x)));
+            return embed.AddFields(name, effectsParse, inline);
+        }
+
+        return embed.AddField(name, Translation.Get<BotTranslations>("Embed.Field.Effects.Content.None", culture), inline);
     }
 
     public static DiscordEmbedBuilder AddCriteriaFields(this DiscordEmbedBuilder embed, CriteriaReadOnlyCollection criteria, CultureInfo? culture, bool inline = false)

diff --git a/Cyberia.Translations/Resources/BotTranslations.Designer.cs b/Cyberia.Translations/Resources/BotTranslations.Designer.cs
diff --git a/Cyberia.Translations/Resources/BotTranslations.fr.resx b/Cyberia.Translations/Resources/BotTranslations.fr.resx
@@ -619,4 +619,7 @@ Pour fuir à 100%, il te faudra au minimum #4 agi.</value>
   <data name="Rgpd.Deleted" xml:space="preserve">
     <value>Toutes vos données personnelles ont été supprimées.</value>
   </data>
+  <data name="Embed.Field.Effects.Content.None" xml:space="preserve">
+    <value>Aucun</value>
+  </data>
 </root>
diff --git a/Cyberia.Translations/Resources/BotTranslations.resx b/Cyberia.Translations/Resources/BotTranslations.resx
@@ -619,4 +619,7 @@ To escape at 100%, you will need at minimum #4 agi.</value>
   <data name="Rgpd.Deleted" xml:space="preserve">
     <value>All your personal data has been deleted.</value>
   </data>
+  <data name="Embed.Field.Effects.Content.None" xml:space="preserve">
+    <value>None</value>
+  </data>
 </root>