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

63
Projects/Server/Items/Container.cs
View file

@ -485,9 +485,6 @@ namespace Server.Items
int extraItems = 0;
int extraWeight = 0;
// from.SendMessage( String.Format( "There are {0} items in this container.", this.Items.Count ) );
// from.SendMessage( String.Format( "There are {0} items being dropped into this container.", droppedItems.Length ) );
for (int i = 0; i < droppedItems.Length; i++)
{
Item dropped = droppedItems[i];
@ -596,9 +593,7 @@ namespace Server.Items
}
}
else
{
from.SendLocalizedMessage(500446); // That is too far away.
}
}
public virtual bool CheckContentDisplay(Mobile from) =>
@ -630,10 +625,7 @@ namespace Server.Items
if (ns != null)
{
if (ns.HighSeas)
to.Send(new ContainerDisplayHS(this));
else
to.Send(new ContainerDisplay(this));
Packets.SendDisplayContainer(ns, Serial, (short)GumpID);
SendContentTo(ns);
@ -642,7 +634,7 @@ namespace Server.Items
List<Item> items = Items;
for (int i = 0; i < items.Count; ++i)
to.Send(items[i].OPLPacket);
items[i].PropertyList.SendOPLInfo(ns);
}
}
}
@ -664,9 +656,7 @@ namespace Server.Items
Mobile mob = Openers[i];
if (mob == opener)
{
contains = true;
}
else
{
int range = GetUpdateRange(mob);
@ -679,24 +669,14 @@ namespace Server.Items
if (!contains)
{
if (Openers == null)
Openers = new List<Mobile>();
Openers ??= new List<Mobile>();
Openers.Add(opener);
}
else if (Openers?.Count == 0)
{
Openers = null;
}
}
public virtual void SendContentTo(NetState state)
{
if (state?.ContainerGridLines == true)
state.Send(new ContainerContent6017(state.Mobile, this));
else
state.Send(new ContainerContent(state.Mobile, this));
}
public virtual void SendContentTo(NetState state) => Packets.SendContainerContent(state, state.Mobile, this);
public override void GetProperties(ObjectPropertyList list)
{
@ -808,8 +788,7 @@ namespace Server.Items
for (int j = 0; j < items[i].Length; ++j)
totals[i] += items[i][j].Amount;
if (totals[i] >= amount)
hasEnough = true;
hasEnough |= totals[i] >= amount;
}
if (!hasEnough)
@ -901,8 +880,7 @@ namespace Server.Items
for (int k = 0; k < items[i][j].Length; ++k)
totals[i][j] += items[i][j][k].Amount;
if (totals[i][j] >= amounts[i])
hasEnough = true;
hasEnough |= totals[i][j] >= amounts[i];
}
if (!hasEnough)
@ -996,8 +974,7 @@ namespace Server.Items
for (int k = 0; k < items[i][j].Length; ++k)
totals[i][j] += items[i][j][k].Amount;
if (totals[i][j] >= amounts[i])
hasEnough = true;
hasEnough |= totals[i][j] >= amounts[i];
}
if (!hasEnough)
@ -1598,12 +1575,10 @@ namespace Server.Items
public class ContainerData
{
private static Dictionary<int, ContainerData> m_Table;
private static readonly Dictionary<int, ContainerData> Table = new Dictionary<int, ContainerData>();
static ContainerData()
{
m_Table = new Dictionary<int, ContainerData>();
string path = Path.Combine(Core.BaseDirectory, "Data/containers.cfg");
if (!File.Exists(path))
@ -1629,7 +1604,7 @@ namespace Server.Items
if (split.Length >= 3)
{
int gumpID = Utility.ToInt32(split[0]);
int gumpId = Utility.ToInt32(split[0]);
string[] aRect = split[1].Split(' ');
if (aRect.Length < 4)
@ -1644,10 +1619,9 @@ namespace Server.Items
int dropSound = Utility.ToInt32(split[2]);
ContainerData data = new ContainerData(gumpID, bounds, dropSound);
ContainerData data = new ContainerData(gumpId, bounds, dropSound);
if (Default == null)
Default = data;
Default ??= data;
if (split.Length >= 4)
{
@ -1657,10 +1631,10 @@ namespace Server.Items
{
int id = Utility.ToInt32(aIDs[i]);
if (m_Table.ContainsKey(id))
if (Table.ContainsKey(id))
Console.WriteLine(@"Warning: double ItemID entry in Data\containers.cfg");
else
m_Table[id] = data;
Table[id] = data;
}
}
}
@ -1672,13 +1646,12 @@ namespace Server.Items
}
}
if (Default == null)
Default = new ContainerData(0x3C, new Rectangle2D(44, 65, 142, 94), 0x48);
Default ??= new ContainerData(0x3C, new Rectangle2D(44, 65, 142, 94), 0x48);
}
public ContainerData(int gumpID, Rectangle2D bounds, int dropSound)
public ContainerData(int gumpId, Rectangle2D bounds, int dropSound)
{
GumpID = gumpID;
GumpID = gumpId;
Bounds = bounds;
DropSound = dropSound;
}
@ -1691,9 +1664,9 @@ namespace Server.Items
public int DropSound{ get; }
public static ContainerData GetData(int itemID)
public static ContainerData GetData(int itemId)
{
m_Table.TryGetValue(itemID, out ContainerData data);
Table.TryGetValue(itemId, out ContainerData data);
return data ?? Default;
}
}