warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit 179cb50557.
This commit is contained in:
Kamron Batman 2019-11-11 08:46:11 -08:00 • committed by GitHub
parent 179cb50557
commit c2ecc76457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
588 changed files with 16260 additions and 10926 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Projects/Scripts/Engines/ConPVP/Games/BombingRun.cs
View file

@ -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()

40
Projects/Scripts/Engines/ConPVP/Games/CTF.cs
View file

@ -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

10
Projects/Scripts/Engines/ConPVP/Games/DoubleDom.cs
View file

@ -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);

19
Projects/Scripts/Engines/ConPVP/Games/KingOfTheHill.cs
View file

@ -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;

2
Projects/Scripts/Engines/ConPVP/Games/TourneyMatch.cs
View file

@ -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 *");