Revert "Updates Packets & Randomizer (#43)" (#61)

This reverts commit 179cb50557.

Projects/Scripts/Engines/ConPVP/Arena.cs

@@ -512,7 +512,7 @@ namespace Server.Engines.ConPVP
         if (offset < offsets.Length)
           p = offsets[offset++];
         else
-          p = offsets[^1];
+          p = offsets[offsets.Length - 1];
 
         p.X = p.X * matrix[0, 0] + p.Y * matrix[0, 1];
         p.Y = p.X * matrix[1, 0] + p.Y * matrix[1, 1];
@@ -574,15 +574,12 @@ namespace Server.Engines.ConPVP
       if (hasBounds)
       {
         List<Mobile> pets = new List<Mobile>();
-        IPooledEnumerable eable = facet.GetMobilesInBounds(m_Bounds);
 
-        foreach (Mobile mob in eable)
+        foreach (Mobile mob in facet.GetMobilesInBounds(m_Bounds))
           if (mob is BaseCreature pet && pet.Controlled && pet.ControlMaster != null &&
               Players.Contains(pet.ControlMaster))
             pets.Add(pet);
 
-        eable.Free();
-
         foreach (Mobile pet in pets)
         {
           pet.Combatant = null;
@@ -752,7 +749,7 @@ namespace Server.Engines.ConPVP
 
     #region Offsets & Rotation
 
-    private static readonly Point2D[] m_EdgeOffsets =
+    private static Point2D[] m_EdgeOffsets =
     {
       /*
        *        /\
@@ -775,7 +772,7 @@ namespace Server.Engines.ConPVP
     };
 
     // nw corner
-    private static readonly Point2D[] m_CornerOffsets =
+    private static Point2D[] m_CornerOffsets =
     {
       /*
        *         /\
@@ -796,7 +793,7 @@ namespace Server.Engines.ConPVP
       new Point2D(3, 0)
     };
 
-    private static readonly int[][,] m_Rotate =
+    private static int[][,] m_Rotate =
     {
       new[,] { { +1, 0 }, { 0, +1 } }, // west
       new[,] { { -1, 0 }, { 0, -1 } }, // east

Projects/Scripts/Engines/ConPVP/DuelContext.cs

@@ -160,7 +160,7 @@ namespace Server.Engines.ConPVP
       if (spell is RecallSpell)
         from.SendMessage("You may not cast this spell.");
 
-      string title;
+      string title = null;
       string option;
 
       if (spell is ArcanistSpell)
@@ -854,9 +854,16 @@ namespace Server.Engines.ConPVP
         Participant p = Participants[i];
 
         if (p.Eliminated)
-          hasWinner |= ++eliminated == Participants.Count - 1;
+        {
+          ++eliminated;
+
+          if (eliminated == Participants.Count - 1)
+            hasWinner = true;
+        }
         else
+        {
           winner = p;
+        }
       }
 
       return hasWinner ? winner ?? Participants[0] : null;
@@ -1623,7 +1630,16 @@ namespace Server.Engines.ConPVP
       int rx = dx - dy;
       int ry = dx + dy;
 
-      bool eastToWest = (rx < 0 || ry < 0) && (rx >= 0 || ry >= 0);
+      bool eastToWest;
+
+      if (rx >= 0 && ry >= 0)
+        eastToWest = false;
+      else if (rx >= 0)
+        eastToWest = true;
+      else if (ry >= 0)
+        eastToWest = true;
+      else
+        eastToWest = false;
 
       Effects.PlaySound(wall, Arena.Facet, 0x1F6);
 
@@ -1801,7 +1817,9 @@ namespace Server.Engines.ConPVP
         }
       }
       else
+      {
         defs = basedef.Options;
+      }
 
       int changes = 0;
 
@@ -1981,7 +1999,9 @@ namespace Server.Engines.ConPVP
       if (!Registered)
         return;
 
-      StartedReadyCountdown |= count != -1;
+      if (count != -1)
+        StartedReadyCountdown = true;
+
       ReadyCount = count;
 
       if (count == 0)

Projects/Scripts/Engines/ConPVP/Games/BombingRun.cs

@@ -293,7 +293,7 @@ namespace Server.Engines.ConPVP
 
         if (list.Count > 0)
         {
-          Point3D p = list[^1];
+          Point3D p = list[list.Count - 1];
 
           if (p.X != ix || p.Y != iy || p.Z != iz)
             list.Add(new Point3D(ix, iy, iz));
@@ -308,7 +308,7 @@ namespace Server.Engines.ConPVP
         z += zslp;
       }
 
-      if (list.Count > 0 && list[^1] != dest)
+      if (list.Count > 0 && list[list.Count - 1] != dest)
         list.Add(dest);
 
       /*if ( dist3d > 4 && ( dest.X != org.X || dest.Y != org.Y ) )
@@ -429,7 +429,10 @@ namespace Server.Engines.ConPVP
             if (t.Z <= point.Z && t.Z + height >= point.Z &&
                 (id.Flags & (TileFlag.Impassable | TileFlag.Wall | TileFlag.NoShoot)) != 0)
             {
-              point = i > m_PathIdx ? m_Path[i - 1] : GetWorldLocation();
+              if (i > m_PathIdx)
+                point = m_Path[i - 1];
+              else
+                point = GetWorldLocation();
               HitObject(point, t.Z, height);
               return;
             }
@@ -445,9 +448,13 @@ namespace Server.Engines.ConPVP
             continue;
 
           if (i is BRGoal)
+          {
             height = 17;
+          }
           else if (i is Blocker)
+          {
             height = 20;
+          }
           else
           {
             ItemData id = i.ItemData;
@@ -466,7 +473,10 @@ namespace Server.Engines.ConPVP
                 (i is Blocker || loc.Z <= point.Z && loc.Z + height >= point.Z))
             {
               found = true;
-              point = j > m_PathIdx ? m_Path[j - 1] : GetWorldLocation();
+              if (j > m_PathIdx)
+                point = m_Path[j - 1];
+              else
+                point = GetWorldLocation();
               break;
             }
           }
@@ -484,7 +494,9 @@ namespace Server.Engines.ConPVP
               HitObject(point, loc.Z, height);
           }
           else
+          {
             HitObject(point, loc.Z, height);
+          }
 
           return;
         }
@@ -499,11 +511,12 @@ namespace Server.Engines.ConPVP
           if (m == null || m == Thrower)
             continue;
 
+          Point3D point;
           Point3D loc = m.Location;
 
           for (int j = m_PathIdx; j < pathCheckEnd && !found; j++)
           {
-            Point3D point = m_Path[j];
+            point = m_Path[j];
 
             if (loc.X == point.X && loc.Y == point.Y &&
                 loc.Z <= point.Z && loc.Z + 16 >= point.Z)
@@ -537,10 +550,9 @@ namespace Server.Engines.ConPVP
         else if (m_Path.Count > 0)
           MoveToWorld(m_Path.Last);
 
-        int myZ = Map?.GetAverageZ(X, Y) ?? 0;
-
-        StaticTile[] statics = Map?.Tiles?.GetStaticTiles(X, Y, true) ?? new StaticTile[0];
+        int myZ = Map.GetAverageZ(X, Y);
 
+        StaticTile[] statics = Map.Tiles.GetStaticTiles(X, Y, true);
         for (int j = 0; j < statics.Length; j++)
         {
           StaticTile t = statics[j];
@@ -664,7 +676,7 @@ namespace Server.Engines.ConPVP
         if (m_Bomb.Parent == null && m_Bomb.m_Game?.Controller != null)
         {
           if (!m_Bomb.m_Flying && m_Bomb.Map != Map.Internal)
-            Effects.SendLocationEffect(m_Bomb.GetWorldLocation(), m_Bomb.Map, 0x377A, 16, 10, m_Bomb.Hue);
+            Effects.SendLocationEffect(m_Bomb.GetWorldLocation(), m_Bomb.Map, 0x377A, 16, 10, m_Bomb.Hue, 0);
 
           if (m_Bomb.Location != m_Bomb.m_Game.Controller.BombHome)
           {
@@ -971,7 +983,9 @@ namespace Server.Engines.ConPVP
         total = entries.Count;
       }
       else
-        total += section.Players.Values.Count(player => player.Score > 0);
+        foreach (BRPlayerInfo player in section.Players.Values)
+          if (player.Score > 0)
+            total++;
 
       entries.Sort();
 
@@ -1708,13 +1722,12 @@ namespace Server.Engines.ConPVP
 
       for (int i = 0; i < m_Context.Participants.Count; ++i)
       {
-        DuelPlayer[] players = m_Context.Participants[i]?.Players;
-        if (players == null)
+        if (!(m_Context.Participants[i] is Participant p) || p.Players == null)
           continue;
 
-        for (int j = 0; j < players.Length; ++j)
+        for (int j = 0; j < p.Players.Length; ++j)
         {
-          DuelPlayer dp = players[j];
+          DuelPlayer dp = p.Players[j];
 
           if (dp?.Mobile != null)
           {
@@ -1723,16 +1736,16 @@ namespace Server.Engines.ConPVP
           }
         }
 
-        if (i == winner?.TeamID)
+        if (i == winner.TeamID)
           continue;
 
-        for (int j = 0; j < players.Length; ++j)
-          if (players[j] != null)
-            players[j].Eliminated = true;
+        if (p.Players != null)
+          for (int j = 0; j < p.Players.Length; ++j)
+            if (p.Players[j] != null)
+              p.Players[j].Eliminated = true;
       }
 
-      if (winner != null)
-        m_Context.Finish(m_Context.Participants[winner.TeamID]);
+      m_Context.Finish(m_Context.Participants[winner.TeamID]);
     }
 
     public override void OnStop()

Projects/Scripts/Engines/ConPVP/Games/CTF.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using Server.Gumps;
 using Server.Items;
@@ -71,13 +70,17 @@ namespace Server.Engines.ConPVP
         {
           CTFTeamInfo teamInfo = game.Controller.TeamInfo[i % 8];
 
-          if (teamInfo?.Flag != null)
-            entries.Add(teamInfo);
+          if (teamInfo?.Flag == null)
+            continue;
+
+          entries.Add(teamInfo);
         }
       else
-        entries.AddRange(section.Players.Values.Where(player => player.Score > 0));
+        foreach (CTFPlayerInfo player in section.Players.Values)
+          if (player.Score > 0)
+            entries.Add(player);
 
-      entries.Sort((a, b) => b.Score - a.Score);
+      entries.Sort(delegate(IRankedCTF a, IRankedCTF b) { return b.Score - a.Score; });
 
       int height = 0;
 
@@ -108,8 +111,7 @@ namespace Server.Engines.ConPVP
       if (section == null)
         for (int i = 0; i < entries.Count; ++i)
         {
-          if (!(entries[i] is CTFTeamInfo teamInfo))
-            continue;
+          CTFTeamInfo teamInfo = entries[i] as CTFTeamInfo;
 
           AddImage(30, 70 + i * 75, 10152);
           AddImage(30, 85 + i * 75, 10151);
@@ -192,7 +194,10 @@ namespace Server.Engines.ConPVP
 
     private void AddColoredText(int x, int y, int width, int height, string text, int color)
     {
-      AddHtml(x, y, width, height, color == 0 ? text : Color(text, color));
+      if (color == 0)
+        AddHtml(x, y, width, height, text);
+      else
+        AddHtml(x, y, width, height, Color(text, color));
     }
   }
 
@@ -241,8 +246,10 @@ namespace Server.Engines.ConPVP
         else if (ourTeam == useTeam)
         {
           if (Location == m_TeamInfo.Origin && Map == m_TeamInfo.Game.Facet)
-            Packets.SendUnicodeMessage(from.NetState, Serial, ItemID, MessageType.Regular, 0x3B2, 3, "ENU", Name,
-              "Touch me not for I am chaste.");
+          {
+            from.Send(new UnicodeMessage(Serial, ItemID, MessageType.Regular, 0x3B2, 3, "ENU", Name,
+              "Touch me not for I am chaste."));
+          }
           else
           {
             CTFPlayerInfo playerInfo = useTeam[from];
@@ -299,7 +306,9 @@ namespace Server.Engines.ConPVP
         m_ReturnCount = Math.Min(m_ReturnCount, 10);
       }
       else
+      {
         SendHome();
+      }
     }
 
     private void StopCountdown()
@@ -408,7 +417,9 @@ namespace Server.Engines.ConPVP
           }
         }
         else
+        {
           from.LocalOverheadMessage(MessageType.Regular, 0x26, false, "Those are not my cookies.");
+        }
       }
       else if (obj is Mobile passTo)
       {
@@ -932,8 +943,15 @@ namespace Server.Engines.ConPVP
 
               if (ourFlagCarrier != null && GetTeamInfo(ourFlagCarrier) == teamInfo)
               {
-                if (ourFlagCarrier.Aggressors.Any(t => t.Defender == ourFlagCarrier && t.Attacker == mob))
+                for (int j = 0; j < ourFlagCarrier.Aggressors.Count; ++j)
+                {
+                  if (!(ourFlagCarrier.Aggressors[j] is AggressorInfo aggr) ||
+                      aggr.Defender != ourFlagCarrier || aggr.Attacker != mob)
+                    continue;
+
                   playerInfo.Score += 2; // helped defend guy capturing enemy flag
+                  break;
+                }
 
                 if (mob.Map == ourFlagCarrier.Map && ourFlagCarrier.InRange(mob, 12))
                   playerInfo.Score += 1; // helped defend guy capturing enemy flag

Projects/Scripts/Engines/ConPVP/Games/DoubleDom.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using Server.Gumps;
 using Server.Items;
@@ -73,9 +72,11 @@ namespace Server.Engines.ConPVP
             entries.Add(teamInfo);
         }
       else
-        entries.AddRange(section.Players.Values.Where(player => player.Score > 0));
+        foreach (DDPlayerInfo player in section.Players.Values)
+          if (player.Score > 0)
+            entries.Add(player);
 
-      entries.Sort((a, b) => b.Score - a.Score);
+      entries.Sort(delegate(IRankedCTF a, IRankedCTF b) { return b.Score - a.Score; });
 
       int height = 0;
 
@@ -106,8 +107,7 @@ namespace Server.Engines.ConPVP
       if (section == null)
         for (int i = 0; i < entries.Count; ++i)
         {
-          if (!(entries[i] is DDTeamInfo teamInfo))
-            continue;
+          DDTeamInfo teamInfo = entries[i] as DDTeamInfo;
 
           AddImage(30, 70 + i * 75, 10152);
           AddImage(30, 85 + i * 75, 10151);

Projects/Scripts/Engines/ConPVP/Games/KingOfTheHill.cs

@@ -171,7 +171,8 @@ namespace Server.Engines.ConPVP
 
       King = m;
 
-      m_KingTimer ??= new KingTimer(this);
+      if (m_KingTimer == null)
+        m_KingTimer = new KingTimer(this);
       m_KingTimer.Stop();
       m_KingTimer.StartHillTicker();
 
@@ -1112,13 +1113,12 @@ namespace Server.Engines.ConPVP
 
       for (int i = 0; i < m_Context.Participants.Count; ++i)
       {
-        DuelPlayer[] players = m_Context.Participants[i]?.Players;
-        if (players == null)
+        if (!(m_Context.Participants[i] is Participant p) || p.Players == null)
           continue;
 
-        for (int j = 0; j < players.Length; ++j)
+        for (int j = 0; j < p.Players.Length; ++j)
         {
-          DuelPlayer dp = players[j];
+          DuelPlayer dp = p.Players[j];
 
           if (dp?.Mobile != null)
           {
@@ -1130,9 +1130,10 @@ namespace Server.Engines.ConPVP
         if (i == winner?.TeamID)
           continue;
 
-        for (int j = 0; j < players.Length; ++j)
-          if (players[j] != null)
-            players[j].Eliminated = true;
+        if (p.Players != null)
+          for (int j = 0; j < p.Players.Length; ++j)
+            if (p.Players[j] != null)
+              p.Players[j].Eliminated = true;
       }
 
       if (winner != null)
@@ -1148,7 +1149,7 @@ namespace Server.Engines.ConPVP
         if (Controller.Hills[i] != null)
           Controller.Hills[i].Game = null;
 
-      foreach (var board in Controller.Boards)
+      foreach (KHBoard board in Controller.Boards)
         if (board != null)
           board.m_Game = null;
 

Projects/Scripts/Engines/ConPVP/Games/TourneyMatch.cs

@@ -106,7 +106,7 @@ namespace Server.Engines.ConPVP
 
             foreach (Mobile view in mob.GetMobilesInRange(18))
               if (!mob.CanSee(view))
-                Packets.SendRemoveEntity(mob.NetState, view.Serial);
+                mob.Send(view.RemovePacket);
 
             mob.LocalOverheadMessage(MessageType.Emote, 0x3B2, false,
               "* Your mind focuses intently on the fight and all other distractions fade away *");

Projects/Scripts/Engines/ConPVP/Gumps/RulesetGump.cs

@@ -93,7 +93,9 @@ namespace Server.Engines.ConPVP
         for (int i = 0; i < info.Switches.Length; ++i)
         {
           int sid = info.Switches[i];
-          opts[sid] |= sid >= 0 && sid < m_Page.Options.Length;
+
+          if (sid >= 0 && sid < m_Page.Options.Length)
+            opts[sid] = true;
         }
 
         for (int i = 0; i < opts.Length; ++i)

Projects/Scripts/Engines/ConPVP/Participant.cs

@@ -173,7 +173,7 @@ namespace Server.Engines.ConPVP
         }
 
       Resize(Players.Length + 1);
-      Players[^1] = new DuelPlayer(player, this);
+      Players[Players.Length - 1] = new DuelPlayer(player, this);
     }
 
     public void Resize(int count)

Projects/Scripts/Engines/ConPVP/Tournament.cs

@@ -433,7 +433,7 @@ namespace Server.Engines.ConPVP
           if (Pyramid.Levels.Count < 1)
             break;
 
-          PyramidLevel top = Pyramid.Levels[^1];
+          PyramidLevel top = Pyramid.Levels[Pyramid.Levels.Count - 1];
 
           if (top.FreeAdvance != null || top.Matches.Count != 1)
             break;
@@ -451,7 +451,7 @@ namespace Server.Engines.ConPVP
           if (Pyramid.Levels.Count < 2)
             break;
 
-          PyramidLevel top = Pyramid.Levels[^1];
+          PyramidLevel top = Pyramid.Levels[Pyramid.Levels.Count - 1];
 
           if (top.FreeAdvance != null || top.Matches.Count != 1)
             break;
@@ -471,7 +471,7 @@ namespace Server.Engines.ConPVP
               GiveAwards(part.Players, TrophyRank.Silver, cash / 2);
           }
 
-          PyramidLevel next = Pyramid.Levels[^2];
+          PyramidLevel next = Pyramid.Levels[Pyramid.Levels.Count - 2];
 
           if (next.Matches.Count > 2)
             break;
@@ -495,7 +495,7 @@ namespace Server.Engines.ConPVP
       }
     }
 
-    private void GiveAwards(IReadOnlyList<Mobile> players, TrophyRank rank, int cash)
+    private void GiveAwards(List<Mobile> players, TrophyRank rank, int cash)
     {
       if (players.Count == 0)
         return;
@@ -663,39 +663,69 @@ namespace Server.Engines.ConPVP
           try
           {
             if (EventController != null)
+            {
               Alert("The tournament has completed!",
                 $"Team {EventController.GetTeamName(Pyramid.Levels[0].Matches[0].Participants.IndexOf(winner))} has won!");
+            }
             else if (TourneyType == TourneyType.RandomTeam)
+            {
               Alert("The tournament has completed!",
                 $"Team {Pyramid.Levels[0].Matches[0].Participants.IndexOf(winner) + 1} has won!");
+            }
             else if (TourneyType == TourneyType.Faction)
             {
               if (m_ParticipantsPerMatch == 4)
               {
-                string name = Pyramid.Levels[0].Matches[0].Participants.IndexOf(winner) switch
+                string name = "(null)";
+
+                switch (Pyramid.Levels[0].Matches[0].Participants.IndexOf(
+                  winner))
                 {
-                  0 => "Minax",
-                  1 => "Council of Mages",
-                  2 => "True Britannians",
-                  3 => "Shadowlords",
-                  _ => "(null)"
-                };
+                  case 0:
+                  {
+                    name = "Minax";
+                    break;
+                  }
+                  case 1:
+                  {
+                    name = "Council of Mages";
+                    break;
+                  }
+                  case 2:
+                  {
+                    name = "True Britannians";
+                    break;
+                  }
+                  case 3:
+                  {
+                    name = "Shadowlords";
+                    break;
+                  }
+                }
 
                 Alert("The tournament has completed!", $"The {name} team has won!");
               }
               else if (m_ParticipantsPerMatch == 2)
+              {
                 Alert("The tournament has completed!",
                   $"The {(Pyramid.Levels[0].Matches[0].Participants.IndexOf(winner) == 0 ? "Evil" : "Hero")} team has won!");
+              }
               else
+              {
                 Alert("The tournament has completed!",
                   $"Team {Pyramid.Levels[0].Matches[0].Participants.IndexOf(winner) + 1} has won!");
+              }
             }
             else if (TourneyType == TourneyType.RedVsBlue)
+            {
               Alert("The tournament has completed!",
                 $"Team {(Pyramid.Levels[0].Matches[0].Participants.IndexOf(winner) == 0 ? "Red" : "Blue")} has won!");
+            }
             else
+            {
               Alert("The tournament has completed!",
                 $"{winner.NameList} {(winner.Players.Count > 1 ? "are" : "is")} the champion{(winner.Players.Count == 1 ? "" : "s")}.");
+            }
           }
           catch
           {
@@ -709,7 +739,7 @@ namespace Server.Engines.ConPVP
         }
         else if (Pyramid.Levels.Count > 0)
         {
-          PyramidLevel activeLevel = Pyramid.Levels[^1];
+          PyramidLevel activeLevel = Pyramid.Levels[Pyramid.Levels.Count - 1];
           bool stillGoing = false;
 
           for (int i = 0; i < activeLevel.Matches.Count; ++i)
@@ -816,6 +846,7 @@ namespace Server.Engines.ConPVP
                         $"The {(Pyramid.Levels[0].Matches[0].Participants.IndexOf(winner) == 0 ? "Evil" : "Hero")} team has won!");
                     }
                     else
+                    {
                       Alert("The tournament has completed!",
                         $"Team {Pyramid.Levels[0].Matches[0].Participants.IndexOf(winner) + 1} has won!");
                     }