fix: Removes wrong error message from Fireflies (#1884)

Projects/UOContent/Engines/Veteran Rewards/RewardDemolitionGump.cs

@@ -36,13 +36,21 @@ namespace Server.Gumps
                 return;
             }
 
-            if (info.ButtonID == (int)Buttons.Confirm)
+            if (info.ButtonID != (int)Buttons.Confirm)
             {
+                return;
+            }
+
             var m = sender.Mobile;
             var house = BaseHouse.FindHouseAt(m);
 
-                if (house?.IsOwner(m) == true)
+            if (house?.IsOwner(m) != true)
             {
+                // You can only re-deed this decoration if you are the house owner or originally placed the decoration.
+                m.SendLocalizedMessage(1049784);
+                return;
+            }
+
             if (m.InRange(item.Location, 2))
             {
                 var deed = m_Addon.Deed;
@@ -59,14 +67,6 @@ namespace Server.Gumps
                 m.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
             }
         }
-                else
-                {
-                    m.SendLocalizedMessage(
-                        1049784
-                    ); // You can only re-deed this decoration if you are the house owner or originally placed the decoration.
-                }
-            }
-        }
 
         private enum Buttons
         {

Projects/UOContent/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs

@@ -4,14 +4,13 @@ using Server.Multis;
 using Server.Network;
 using Server.Targeting;
 
-namespace Server.Items
+namespace Server.Items;
-{
+
 [SerializationGenerator(0)]
 public partial class Fireflies : Item, IAddon
 {
     [Constructible]
-        public Fireflies(int itemID = 0x1596)
+    public Fireflies(int itemID = 0x1596) : base(itemID)
-            : base(itemID)
     {
         LootType = LootType.Blessed;
         Movable = false;
@@ -30,32 +29,31 @@ namespace Server.Items
             return false;
         }
 
-            return FacingSouth ?
+        return FacingSouth
-                BaseAddon.IsWall(p.X, p.Y - 1, p.Z, map) :
+            ? BaseAddon.IsWall(p.X, p.Y - 1, p.Z, map)
-                BaseAddon.IsWall(p.X - 1, p.Y, p.Z, map);
+            : BaseAddon.IsWall(p.X - 1, p.Y, p.Z, map);
     }
 
     public override void OnDoubleClick(Mobile from)
     {
-            if (from.InRange(Location, 3))
+        if (!from.InRange(Location, 3))
         {
+            from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
+            return;
+        }
+
         var house = BaseHouse.FindHouseAt(this);
 
         if (house?.IsOwner(from) == true)
         {
             from.CloseGump<RewardDemolitionGump>();
-                    from.SendGump(new RewardDemolitionGump(this, 1049783)); // Do you wish to re-deed this decoration?
+            // Do you wish to re-deed this decoration?
+            from.SendGump(new RewardDemolitionGump(this, 1049783));
         }
         else
         {
-                    from.SendLocalizedMessage(
+            // You can only re-deed this decoration if you are the house owner or originally placed the decoration.
-                        1049784
+            from.SendLocalizedMessage(1049784);
-                    ); // You can only re-deed this decoration if you are the house owner or originally placed the decoration.
-                }
-            }
-            else
-            {
-                from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
         }
     }
 }
@@ -64,8 +62,7 @@ namespace Server.Items
 public partial class FirefliesDeed : Item
 {
     [Constructible]
-        public FirefliesDeed()
+    public FirefliesDeed() : base(0x14F0)
-            : base(0x14F0)
     {
         LootType = LootType.Blessed;
         Weight = 1.0;
@@ -75,40 +72,33 @@ namespace Server.Items
 
     public override void OnDoubleClick(Mobile from)
     {
-            if (IsChildOf(from.Backpack))
+        if (!IsChildOf(from.Backpack))
-            {
-                var house = BaseHouse.FindHouseAt(from);
-
-                if (house?.IsOwner(from) == true)
-                {
-                    from.CloseGump<FacingGump>();
-
-                    if (!from.SendGump(new FacingGump(this, from)))
-                    {
-                        from.SendLocalizedMessage(1150062); // You fail to re-deed the holiday fireflies.
-                    }
-                }
-                else
-                {
-                    from.SendLocalizedMessage(502092); // You must be in your house to do this.
-                }
-            }
-            else
         {
             from.SendLocalizedMessage(1042038); // You must have the object in your backpack to use it.
+            return;
         }
+
+        var house = BaseHouse.FindHouseAt(from);
+
+        if (house?.IsOwner(from) != true)
+        {
+            from.SendLocalizedMessage(502092); // You must be in your house to do this.
+            return;
+        }
+
+        from.CloseGump<FacingGump>();
+        from.SendGump(new FacingGump(this, from));
     }
 
     private class FacingGump : Gump
     {
-            private readonly FirefliesDeed m_Deed;
+        private readonly FirefliesDeed _deed;
-            private readonly Mobile m_Placer;
+        private readonly Mobile _placer;
 
-            public FacingGump(FirefliesDeed deed, Mobile player)
+        public FacingGump(FirefliesDeed deed, Mobile player) : base(150, 50)
-                : base(150, 50)
         {
-                m_Deed = deed;
+            _deed = deed;
-                m_Placer = player;
+            _placer = player;
 
             Closable = true;
             Disposable = true;
@@ -128,20 +118,19 @@ namespace Server.Items
 
         public override void OnResponse(NetState sender, in RelayInfo info)
         {
-                int m_ItemID;
+            if (info.ButtonID == (int)Buttons.Cancel)
-
-                switch (info.ButtonID)
             {
-                    case (int)Buttons.East:
+                return;
-                        m_ItemID = 0x2332;
-                        break;
-                    case (int)Buttons.South:
-                        m_ItemID = 0x2336;
-                        break;
-                    default: return;
             }
 
-                m_Placer.Target = new InternalTarget(m_Deed, m_ItemID);
+            int itemId = info.ButtonID switch
+            {
+                (int)Buttons.East  => 0x2332,
+                (int)Buttons.South => 0x2336,
+                _                  => 0
+            };
+
+            _placer.Target = new InternalTarget(_deed, itemId);
         }
 
         private enum Buttons
@@ -154,29 +143,36 @@ namespace Server.Items
 
     private class InternalTarget : Target
     {
-            private readonly FirefliesDeed m_FirefliesDeed;
+        private readonly FirefliesDeed _firefliesDeed;
-            private readonly int m_ItemID;
+        private readonly int _itemId;
 
-            public InternalTarget(FirefliesDeed m_Deed, int itemid)
+        public InternalTarget(FirefliesDeed _deed, int itemId) : base(-1, true, TargetFlags.None)
-                : base(-1, true, TargetFlags.None)
         {
-                m_FirefliesDeed = m_Deed;
+            _firefliesDeed = _deed;
-                m_ItemID = itemid;
+            _itemId = itemId;
         }
 
         protected override void OnTarget(Mobile from, object targeted)
         {
-                if (m_FirefliesDeed?.Deleted != false)
+            if (_firefliesDeed?.Deleted != false)
             {
                 return;
             }
 
-                if (m_FirefliesDeed.IsChildOf(from.Backpack))
+            if (!_firefliesDeed.IsChildOf(from.Backpack))
             {
+                from.SendLocalizedMessage(1042038); // You must have the object in your backpack to use it.
+                return;
+            }
+
             var house = BaseHouse.FindHouseAt(from);
 
-                    if (house?.IsOwner(from) == true)
+            if (house?.IsOwner(from) != true)
             {
+                from.SendLocalizedMessage(502092); // You must be in your house to do this.
+                return;
+            }
+
             var p = targeted as IPoint3D;
             var map = from.Map;
 
@@ -186,62 +182,44 @@ namespace Server.Items
             }
 
             var p3d = new Point3D(p);
-                        var id = TileData.ItemTable[m_ItemID & TileData.MaxItemValue];
+            var id = TileData.ItemTable[_itemId & TileData.MaxItemValue];
 
-                        if (map.CanFit(p3d, id.Height))
+            if (!map.CanFit(p3d, id.Height))
             {
+                from.SendLocalizedMessage(500269); // You cannot build that there.
+                return;
+            }
+
             house = BaseHouse.FindHouseAt(p3d, map, id.Height);
 
-                            if (house?.IsOwner(from) == true)
+            if (house?.IsOwner(from) != true)
             {
+                from.SendLocalizedMessage(1042036); // That location is not in your house.
+                return;
+            }
+
             var north = BaseAddon.IsWall(p3d.X, p3d.Y - 1, p3d.Z, map);
             var west = BaseAddon.IsWall(p3d.X - 1, p3d.Y, p3d.Z, map);
 
-                                bool isclear = true;
+            if ((_itemId != 0x2336 || !north) && (_itemId != 0x2332 || !west))
+            {
+                from.SendLocalizedMessage(1150065); // Holiday fireflies must be placed next to a wall.
+                return;
+            }
 
             foreach (Fireflies fireflies in Map.Malas.GetItemsAt<Fireflies>(p3d))
             {
                 if (fireflies.Z == p3d.Z)
-                                    {
-                                        isclear = false;
-                                    }
-                                }
-
-                                if ((m_ItemID == 0x2336 && north || m_ItemID == 0x2332 && west) && isclear)
-                                {
-                                    var flies = new Fireflies(m_ItemID);
-
-                                    house.Addons.Add(flies);
-
-                                    flies.MoveToWorld(p3d, from.Map);
-
-                                    m_FirefliesDeed.Delete();
-                                }
-                                else
                 {
                     from.SendLocalizedMessage(1150065); // Holiday fireflies must be placed next to a wall.
+                    return;
                 }
             }
-                            else
+
-                            {
+            var flies = new Fireflies(_itemId);
-                                from.SendLocalizedMessage(1042036); // That location is not in your house.
+            house.Addons.Add(flies);
-                            }
+            flies.MoveToWorld(p3d, from.Map);
-                        }
+            _firefliesDeed.Delete();
-                        else
-                        {
-                            from.SendLocalizedMessage(500269); // You cannot build that there.
-                        }
-                    }
-                    else
-                    {
-                        from.SendLocalizedMessage(502092); // You must be in your house to do this.
-                    }
-                }
-                else
-                {
-                    from.SendLocalizedMessage(1042038); // You must have the object in your backpack to use it.
-                }
-            }
         }
     }
 }