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

Updates Packets & Randomizer (#43)

Browse source 
* Fixes a bug with the main loop. Removes unnecessary optimizations for RDRand.

* WIP - Rewriting packets.

* Cleanup and updates README

* Converts more packets

* Fixes header

* Converts Effects packets.

* Forgot the send command

* Adds the start of containers packets.

* Adds message packets with caching

* Extends the send methods

* Starts to add Acquire methods

* Converted the packets

* Cleanup

* Cleanup

* Adds more packets

* Adds more packets

* Fixes clearing arrays from pool. Adds Mobile Incoming

* Converts more packets.

* Moves more packets

* Moves more packets

* Test compression

* Merges

* Migrating to an idiomatic syntax that also supports compression, and proxying.

* Optimize the stack alloc. Changes attributes

* Converted container packets

* Visual Studio doesn't auto save files. I am still getting used to subpar IDEs.

* Adds static packet caching. Will profile later. Converts more packets

* Fixes packets and changes how compression is configured

* WIP - Adds basics for Gumps. Not finished though.

* Fix file

* Fixes formatting

* Changed SpanWriter to be more idiomatic.

* Fixes Span vs RawSpan and missing stackallocs

* Converts over some more gumps

* WIP - Deletes 32bit support.

* Drops RDRand32 support.

* Fixes gump compilation

* Converting gump components

* Removes old huffman compression function

* Revert signature for backwards compatibility

* WIP - Converting more gump components

* Creates ArraySet for the strings. Updates AppendTo to reference that.

* Converts the maining gump components

* Cleans up gump components

* Cleans up directives

* Cleans up ArraySet and moves it. Adds null-coalescing-assignment

* Cleanup, Target Packets, and C# 8 changes.

* Removed OPL Packet

* World packets

* Fixing packet uses

* Cleans up code. Fixes packet uses in various places.

* More cleanup for packets

* Code cleanup

* Converts more packet uses and cleans up more code

* More code cleanup

* Finishes fixing the packets in Item

* Updates secure trade packets

* Updates core and gets it to compile.

* Moved packets to scripts. Fixed account handler use of packets

* Code cleanup

* Updates chat packets

* Code cleanuo

* Adds party packets, but need to implement them.

* Party packets WIP

* Finishes party packets

* Rearrange movement namespaces and classes

* Finishes plant packets

* Code Formatting

* Fixes moving effects

* Code cleanup, eliminates equipinfo

* Adds more packets. Fixes bugs with various packets.

* Finishes mahjon packets

* Fixes mahjong packet

* Code cleanup

* Finishes mahjong packets

* Adds Map packets

* Add multifacet maps and charts

* Cleans up some packets with UTF8

* Optimizes packets

* Cleans up more packets. Moves the MessageHelper

* Removes assistant support. Removes extended protocol. Incorporates MapUO packets as normal packets.

* Updates protocol extensions packet receiver

* Fixes a few bugs. Fixes a few more packets.

* Code cleanup and fixing more packets

* Fixes packet effects

* Cleaned up more code

* Buff Icon cleanup

* Removed unused constructors

* Code Cleanup. Adds BoatHS Packets

* Moves house files. Updates house foundation packets.

* Deployment cleanup

* Fixes:

* Code cleanup

* More code cleanup

* More code cleanup

* Cleaned up BaseHouse

* Enforces styling

* Converts foreach to linq where possible.

* Dont need that

* Goals/Readme updates

* Removes 32bit support at the highest level. Turns on HRT by default.

* Code cleanup. Fixes extended features packet.

* Fixes various bugs

* Code cleanup

* Code cleanup

* Code cleanup. Fixes gump X/Y assignment.

* Code cleanup using |= operator

* More code cleanup

* Cleanup

* Fixes spacing issues. Thanks Visual Studio. You suck.

* Compiler error

* Fixes NPE from RunUO 2.7

* Renames ScriptCompiler to AssemblyHandler. Fixes packets. Updates README

* Fixes more packets. Stupid trailing nulls.

* Fixes various bugs.

* Fixes for gumps

* Fixes more gump stuff. Going to split it out later since it is getting insane

* Recoded the gump writing

* WIP

* *Added output path of scripts project to dev branch
*Activated debugging in code
This commit is contained in:
Kamron Batman 2019-11-11 03:40:16 -08:00 • committed by 3HMonkey
parent 7aa8fd3df1
commit 179cb50557
588 changed files with 10843 additions and 16177 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Projects/Scripts/Engines/ConPVP/Arena.cs
View file

@ -512,7 +512,7 @@ namespace Server.Engines.ConPVP
if (offset < offsets.Length)
p = offsets[offset++];
else
p = offsets[offsets.Length - 1];
p = offsets[^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,12 +574,15 @@ namespace Server.Engines.ConPVP
if (hasBounds)
{
List<Mobile> pets = new List<Mobile>();
IPooledEnumerable eable = facet.GetMobilesInBounds(m_Bounds);
foreach (Mobile mob in facet.GetMobilesInBounds(m_Bounds))
foreach (Mobile mob in eable)
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;
@ -749,7 +752,7 @@ namespace Server.Engines.ConPVP
#region Offsets & Rotation
private static Point2D[] m_EdgeOffsets =
private static readonly Point2D[] m_EdgeOffsets =
{
/*
* /\
@ -772,7 +775,7 @@ namespace Server.Engines.ConPVP
};
// nw corner
private static Point2D[] m_CornerOffsets =
private static readonly Point2D[] m_CornerOffsets =
{
/*
* /\
@ -793,7 +796,7 @@ namespace Server.Engines.ConPVP
new Point2D(3, 0)
};
private static int[][,] m_Rotate =
private static readonly int[][,] m_Rotate =
{
new[,] { { +1, 0 }, { 0, +1 } }, // west
new[,] { { -1, 0 }, { 0, -1 } }, // east

28
Projects/Scripts/Engines/ConPVP/DuelContext.cs
View file

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

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

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

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

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

@ -171,8 +171,7 @@ namespace Server.Engines.ConPVP
King = m;
if (m_KingTimer == null)
m_KingTimer = new KingTimer(this);
m_KingTimer ??= new KingTimer(this);
m_KingTimer.Stop();
m_KingTimer.StartHillTicker();
@ -1113,12 +1112,13 @@ namespace Server.Engines.ConPVP
for (int i = 0; i < m_Context.Participants.Count; ++i)
{
if (!(m_Context.Participants[i] is Participant p) || p.Players == null)
DuelPlayer[] players = m_Context.Participants[i]?.Players;
if (players == null)
continue;
for (int j = 0; j < p.Players.Length; ++j)
for (int j = 0; j < players.Length; ++j)
{
DuelPlayer dp = p.Players[j];
DuelPlayer dp = players[j];
if (dp?.Mobile != null)
{
@ -1130,10 +1130,9 @@ namespace Server.Engines.ConPVP
if (i == winner?.TeamID)
continue;
if (p.Players != null)
for (int j = 0; j < p.Players.Length; ++j)
if (p.Players[j] != null)
p.Players[j].Eliminated = true;
for (int j = 0; j < players.Length; ++j)
if (players[j] != null)
players[j].Eliminated = true;
}
if (winner != null)
@ -1149,7 +1148,7 @@ namespace Server.Engines.ConPVP
if (Controller.Hills[i] != null)
Controller.Hills[i].Game = null;
foreach (KHBoard board in Controller.Boards)
foreach (var 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))
mob.Send(view.RemovePacket);
Packets.SendRemoveEntity(mob.NetState, view.Serial);
mob.LocalOverheadMessage(MessageType.Emote, 0x3B2, false,
"* Your mind focuses intently on the fight and all other distractions fade away *");

4
Projects/Scripts/Engines/ConPVP/Gumps/RulesetGump.cs
View file

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

2
Projects/Scripts/Engines/ConPVP/Participant.cs
View file

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

55
Projects/Scripts/Engines/ConPVP/Tournament.cs
View file

@ -433,7 +433,7 @@ namespace Server.Engines.ConPVP
if (Pyramid.Levels.Count < 1)
break;
PyramidLevel top = Pyramid.Levels[Pyramid.Levels.Count - 1];
PyramidLevel top = Pyramid.Levels[^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[Pyramid.Levels.Count - 1];
PyramidLevel top = Pyramid.Levels[^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[Pyramid.Levels.Count - 2];
PyramidLevel next = Pyramid.Levels[^2];
if (next.Matches.Count > 2)
break;
@ -495,7 +495,7 @@ namespace Server.Engines.ConPVP
}
}
private void GiveAwards(List<Mobile> players, TrophyRank rank, int cash)
private void GiveAwards(IReadOnlyList<Mobile> players, TrophyRank rank, int cash)
{
if (players.Count == 0)
return;
@ -663,69 +663,39 @@ 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 = "(null)";
switch (Pyramid.Levels[0].Matches[0].Participants.IndexOf(
winner))
string name = Pyramid.Levels[0].Matches[0].Participants.IndexOf(winner) switch
{
case 0:
{
name = "Minax";
break;
}
case 1:
{
name = "Council of Mages";
break;
}
case 2:
{
name = "True Britannians";
break;
}
case 3:
{
name = "Shadowlords";
break;
}
}
0 => "Minax",
1 => "Council of Mages",
2 => "True Britannians",
3 => "Shadowlords",
_ => "(null)"
};
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
{
@ -739,7 +709,7 @@ namespace Server.Engines.ConPVP
}
else if (Pyramid.Levels.Count > 0)
{
PyramidLevel activeLevel = Pyramid.Levels[Pyramid.Levels.Count - 1];
PyramidLevel activeLevel = Pyramid.Levels[^1];
bool stillGoing = false;
for (int i = 0; i < activeLevel.Matches.Count; ++i)
@ -846,7 +816,6 @@ 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!");
}