Updates Packets & Randomizer (#43)
* 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
3HMonkey
parent
7aa8fd3df1
commit
179cb50557
588 changed files with 10843 additions and 16177 deletions
|
|
@ -18,16 +18,11 @@
|
|||
*
|
||||
***************************************************************************/
|
||||
|
||||
#region References
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Server.Accounting;
|
||||
using Server.Items;
|
||||
using Server.Network;
|
||||
|
||||
#endregion
|
||||
|
||||
namespace Server
|
||||
{
|
||||
public class SecureTrade
|
||||
|
|
@ -39,56 +34,33 @@ namespace Server
|
|||
From = new SecureTradeInfo(this, from, new SecureTradeContainer(this));
|
||||
To = new SecureTradeInfo(this, to, new SecureTradeContainer(this));
|
||||
|
||||
bool from6017 = from.NetState?.ContainerGridLines == true;
|
||||
bool to6017 = to.NetState?.ContainerGridLines == true;
|
||||
NetState fromNS = from.NetState;
|
||||
NetState toNS = to.NetState;
|
||||
|
||||
bool from704565 = from.NetState?.NewSecureTrading == true;
|
||||
bool to704565 = to.NetState?.NewSecureTrading == true;
|
||||
|
||||
from.Send(new MobileStatus(from, to));
|
||||
from.Send(new UpdateSecureTrade(From.Container, false, false));
|
||||
|
||||
if (from6017)
|
||||
from.Send(new SecureTradeEquip6017(To.Container, to));
|
||||
else
|
||||
from.Send(new SecureTradeEquip(To.Container, to));
|
||||
|
||||
from.Send(new UpdateSecureTrade(From.Container, false, false));
|
||||
|
||||
if (from6017)
|
||||
from.Send(new SecureTradeEquip6017(From.Container, from));
|
||||
else
|
||||
from.Send(new SecureTradeEquip(From.Container, from));
|
||||
|
||||
from.Send(new DisplaySecureTrade(to, From.Container, To.Container, to.Name));
|
||||
from.Send(new UpdateSecureTrade(From.Container, false, false));
|
||||
bool from704565 = fromNS?.NewSecureTrading == true;
|
||||
bool to704565 = toNS?.NewSecureTrading == true;
|
||||
|
||||
Packets.SendMobileStatus(fromNS, from, to);
|
||||
Packets.SendUpdateSecureTrade(fromNS, From.Container.Serial, false, false);
|
||||
Packets.SendSecureTradeEquip(fromNS, To.Container, to.Serial);
|
||||
Packets.SendUpdateSecureTrade(fromNS, From.Container.Serial, false, false);
|
||||
Packets.SendSecureTradeEquip(fromNS, To.Container, from.Serial);
|
||||
Packets.SendDisplaySecureTrade(fromNS, to.Serial, From.Container.Serial, To.Container.Serial, to.Name);
|
||||
Packets.SendUpdateSecureTrade(fromNS, From.Container.Serial, false, false);
|
||||
if (from.Account != null && from704565)
|
||||
from.Send(
|
||||
new UpdateSecureTrade(From.Container, TradeFlag.UpdateLedger, from.Account.TotalGold,
|
||||
from.Account.TotalPlat));
|
||||
|
||||
to.Send(new MobileStatus(to, from));
|
||||
to.Send(new UpdateSecureTrade(To.Container, false, false));
|
||||
|
||||
if (to6017)
|
||||
to.Send(new SecureTradeEquip6017(From.Container, from));
|
||||
else
|
||||
to.Send(new SecureTradeEquip(From.Container, from));
|
||||
|
||||
to.Send(new UpdateSecureTrade(To.Container, false, false));
|
||||
|
||||
if (to6017)
|
||||
to.Send(new SecureTradeEquip6017(To.Container, to));
|
||||
else
|
||||
to.Send(new SecureTradeEquip(To.Container, to));
|
||||
|
||||
to.Send(new DisplaySecureTrade(from, To.Container, From.Container, from.Name));
|
||||
to.Send(new UpdateSecureTrade(To.Container, false, false));
|
||||
Packets.SendUpdateSecureTrade(fromNS, From.Container.Serial, TradeFlag.UpdateLedger,from.Account.TotalGold,
|
||||
from.Account.TotalPlat);
|
||||
|
||||
Packets.SendMobileStatus(toNS, to, from);
|
||||
Packets.SendUpdateSecureTrade(toNS, To.Container.Serial, false, false);
|
||||
Packets.SendSecureTradeEquip(toNS, From.Container, from.Serial);
|
||||
Packets.SendUpdateSecureTrade(toNS, To.Container.Serial, false, false);
|
||||
Packets.SendSecureTradeEquip(toNS, From.Container, to.Serial);
|
||||
Packets.SendDisplaySecureTrade(toNS, from.Serial, To.Container.Serial, From.Container.Serial, from.Name);
|
||||
Packets.SendUpdateSecureTrade(toNS, To.Container.Serial, false, false);
|
||||
if (to.Account != null && to704565)
|
||||
to.Send(new UpdateSecureTrade(To.Container, TradeFlag.UpdateLedger, to.Account.TotalGold,
|
||||
to.Account.TotalPlat));
|
||||
Packets.SendUpdateSecureTrade(toNS, To.Container.Serial, TradeFlag.UpdateLedger,to.Account.TotalGold,
|
||||
to.Account.TotalPlat);
|
||||
}
|
||||
|
||||
public SecureTradeInfo From{ get; }
|
||||
|
|
@ -112,7 +84,8 @@ namespace Server
|
|||
|
||||
item.OnSecureTrade(From.Mobile, To.Mobile, From.Mobile, false);
|
||||
|
||||
if (!item.Deleted) From.Mobile.AddToBackpack(item);
|
||||
if (!item.Deleted)
|
||||
From.Mobile.AddToBackpack(item);
|
||||
}
|
||||
|
||||
list = To.Container.Items;
|
||||
|
|
@ -136,16 +109,15 @@ namespace Server
|
|||
{
|
||||
if (!Valid) return;
|
||||
|
||||
From.Mobile.Send(new CloseSecureTrade(From.Container));
|
||||
To.Mobile.Send(new CloseSecureTrade(To.Container));
|
||||
|
||||
Valid = false;
|
||||
|
||||
NetState ns = From.Mobile.NetState;
|
||||
Packets.SendCloseSecureTrade(ns, From.Container.Serial);
|
||||
|
||||
ns?.RemoveTrade(this);
|
||||
|
||||
ns = To.Mobile.NetState;
|
||||
Packets.SendCloseSecureTrade(ns, To.Container.Serial);
|
||||
|
||||
ns?.RemoveTrade(this);
|
||||
|
||||
|
|
@ -170,8 +142,9 @@ namespace Server
|
|||
int plat = left.Mobile.Account.TotalPlat;
|
||||
int gold = left.Mobile.Account.TotalGold;
|
||||
|
||||
left.Mobile.Send(new UpdateSecureTrade(left.Container, TradeFlag.UpdateLedger, gold, plat));
|
||||
}
|
||||
if (from.NetState?.NewSecureTrading == true)
|
||||
Packets.SendUpdateSecureTrade(from.NetState, left.Container.Serial, TradeFlag.UpdateLedger,
|
||||
from.Account.TotalPlat, from.Account.TotalGold);
|
||||
|
||||
if (right.Mobile.NetState?.NewSecureTrading == true)
|
||||
right.Mobile.Send(new UpdateSecureTrade(right.Container, TradeFlag.UpdateGold, left.Gold, left.Plat));
|
||||
|
|
@ -241,8 +214,8 @@ namespace Server
|
|||
From.Accepted = false;
|
||||
To.Accepted = false;
|
||||
|
||||
From.Mobile.Send(new UpdateSecureTrade(From.Container, From.Accepted, To.Accepted));
|
||||
To.Mobile.Send(new UpdateSecureTrade(To.Container, To.Accepted, From.Accepted));
|
||||
Packets.SendUpdateSecureTrade(From.Mobile.NetState, From.Container.Serial, From.Accepted, To.Accepted);
|
||||
Packets.SendUpdateSecureTrade(To.Mobile.NetState, To.Container.Serial, To.Accepted, From.Accepted);
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
@ -282,8 +255,8 @@ namespace Server
|
|||
}
|
||||
else if (!From.IsDisposed && !To.IsDisposed)
|
||||
{
|
||||
From.Mobile.Send(new UpdateSecureTrade(From.Container, From.Accepted, To.Accepted));
|
||||
To.Mobile.Send(new UpdateSecureTrade(To.Container, To.Accepted, From.Accepted));
|
||||
Packets.SendUpdateSecureTrade(From.Mobile.NetState, From.Container.Serial, From.Accepted, To.Accepted);
|
||||
Packets.SendUpdateSecureTrade(To.Mobile.NetState, To.Container.Serial, To.Accepted, From.Accepted);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue