fix: Streamlines potion drink effect (#1851)

modernuo · Jul 3, 2024 · cbaa349 · cbaa349
1 parent d40041d
commit cbaa349
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 44 deletions.
diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/Agility Potions/BaseAgilityPotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/Agility Potions/BaseAgilityPotion.cs
@@ -1,6 +1,5 @@
 using System;
 using ModernUO.Serialization;
-using Server.Engines.ConPVP;
 using Server.Spells;
 
 namespace Server.Items;
@@ -34,11 +33,6 @@ public override void Drink(Mobile from)
         if (DoAgility(from))
         {
             PlayDrinkEffect(from);
-
-            if (!DuelContext.IsFreeConsume(from))
-            {
-                Consume();
-            }
         }
     }
 }
diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/BasePotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/BasePotion.cs
@@ -174,14 +174,15 @@ private void Deserialize(IGenericReader reader, int version)
 
     public abstract void Drink(Mobile from);
 
-    public static void PlayDrinkEffect(Mobile m)
+    public void PlayDrinkEffect(Mobile m)
     {
         m.RevealingAction();
 
         m.PlaySound(0x2D6);
 
         if (!DuelContext.IsFreeConsume(m))
         {
+            Consume();
             m.AddToBackpack(new Bottle());
         }
 

diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/Cure Potions/BaseCurePotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/Cure Potions/BaseCurePotion.cs
@@ -1,5 +1,4 @@
 using ModernUO.Serialization;
-using Server.Engines.ConPVP;
 using Server.Spells;
 using Server.Spells.Necromancy;
 
@@ -71,11 +70,6 @@ public override void Drink(Mobile from)
 
             from.FixedParticles(0x373A, 10, 15, 5012, EffectLayer.Waist);
             from.PlaySound(0x1E0);
-
-            if (!DuelContext.IsFreeConsume(from))
-            {
-                Consume();
-            }
         }
         else
         {

diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/Heal Potions/BaseHealPotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/Heal Potions/BaseHealPotion.cs
@@ -1,6 +1,5 @@
 using System;
 using ModernUO.Serialization;
-using Server.Engines.ConPVP;
 
 namespace Server.Items;
 
@@ -50,11 +49,6 @@ public override void Drink(Mobile from)
 
         PlayDrinkEffect(from);
 
-        if (!DuelContext.IsFreeConsume(from))
-        {
-            Consume();
-        }
-
         Timer.StartTimer(TimeSpan.FromSeconds(Delay), from.EndAction<BaseHealPotion>);
     }
 }
diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/InvisibilityPotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/InvisibilityPotion.cs
@@ -28,7 +28,6 @@ public override void Drink(Mobile from)
             return;
         }
 
-        Consume();
         Timer.StartTimer(TimeSpan.FromSeconds(2), () => Hide(from), out var timerToken);
         m_Table[from] = timerToken;
         PlayDrinkEffect(from);

diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/NightSight.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/NightSight.cs
@@ -1,5 +1,4 @@
 using ModernUO.Serialization;
-using Server.Engines.ConPVP;
 
 namespace Server.Items;
 
@@ -22,11 +21,6 @@ public override void Drink(Mobile from)
             from.PlaySound(0x1E3);
 
             PlayDrinkEffect(from);
-
-            if (!DuelContext.IsFreeConsume(from))
-            {
-                Consume();
-            }
         }
         else
         {

diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/Poison Potions/BasePoisonPotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/Poison Potions/BasePoisonPotion.cs
@@ -1,5 +1,4 @@
 using ModernUO.Serialization;
-using Server.Engines.ConPVP;
 
 namespace Server.Items;
 
@@ -25,10 +24,5 @@ public override void Drink(Mobile from)
         DoPoison(from);
 
         PlayDrinkEffect(from);
-
-        if (!DuelContext.IsFreeConsume(from))
-        {
-            Consume();
-        }
     }
 }
diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/Refresh Potions/BaseRefreshPotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/Refresh Potions/BaseRefreshPotion.cs
@@ -1,5 +1,4 @@
 using ModernUO.Serialization;
-using Server.Engines.ConPVP;
 
 namespace Server.Items;
 
@@ -19,11 +18,6 @@ public override void Drink(Mobile from)
             from.Stam += Scale(from, (int)(Refresh * from.StamMax));
 
             PlayDrinkEffect(from);
-
-            if (!DuelContext.IsFreeConsume(from))
-            {
-                Consume();
-            }
         }
         else
         {

diff --git a/Projects/UOContent/Items/Skill Items/Magical/Potions/Strength Potions/BaseStrengthPotion.cs b/Projects/UOContent/Items/Skill Items/Magical/Potions/Strength Potions/BaseStrengthPotion.cs
@@ -1,6 +1,5 @@
 using System;
 using ModernUO.Serialization;
-using Server.Engines.ConPVP;
 using Server.Spells;
 
 namespace Server.Items;
@@ -34,11 +33,6 @@ public override void Drink(Mobile from)
         if (DoStrength(from))
         {
             PlayDrinkEffect(from);
-
-            if (!DuelContext.IsFreeConsume(from))
-            {
-                Consume();
-            }
         }
     }
 }