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
|
|
@ -185,7 +185,7 @@ namespace Server.Mobiles
|
|||
|
||||
public void OnRequestedAnimation(Mobile from)
|
||||
{
|
||||
from.Send(new UpdateStatueAnimation(this, 1, m_Animation, m_Frames));
|
||||
StatuePackets.SendUpdateStatueAnimation(from.NetState, Serial, 1, m_Animation, m_Frames);
|
||||
}
|
||||
|
||||
public override void OnAosSingleClick(Mobile from)
|
||||
|
|
@ -364,22 +364,14 @@ namespace Server.Mobiles
|
|||
{
|
||||
ProcessDelta();
|
||||
|
||||
Packet p = null;
|
||||
|
||||
IPooledEnumerable<NetState> eable = Map.GetClientsInRange(Location);
|
||||
|
||||
foreach (NetState state in eable)
|
||||
{
|
||||
state.Mobile.ProcessDelta();
|
||||
|
||||
if (p == null)
|
||||
p = Packet.Acquire(new UpdateStatueAnimation(this, 1, m_Animation, m_Frames));
|
||||
|
||||
state.Send(p);
|
||||
StatuePackets.SendUpdateStatueAnimation(state, Serial, 1, m_Animation, m_Frames);
|
||||
}
|
||||
|
||||
Packet.Release(p);
|
||||
|
||||
eable.Free();
|
||||
}
|
||||
}
|
||||
|
|
@ -424,9 +416,8 @@ namespace Server.Mobiles
|
|||
{
|
||||
}
|
||||
|
||||
public override int LabelNumber
|
||||
{
|
||||
get
|
||||
public override int LabelNumber =>
|
||||
(Statue?.StatueType ?? m_Type) switch
|
||||
{
|
||||
StatueType t = m_Type;
|
||||
|
||||
|
|
@ -448,13 +439,7 @@ namespace Server.Mobiles
|
|||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public StatueType StatueType
|
||||
{
|
||||
get
|
||||
{
|
||||
if (Statue != null)
|
||||
return Statue.StatueType;
|
||||
|
||||
return m_Type;
|
||||
}
|
||||
get => Statue?.StatueType ?? m_Type;
|
||||
set => m_Type = value;
|
||||
}
|
||||
|
||||
|
|
@ -611,18 +596,11 @@ namespace Server.Mobiles
|
|||
from.SendGump(new CharacterStatueGump(m_Maker, statue, from));
|
||||
}
|
||||
else if (result == AddonFitResult.Blocked)
|
||||
{
|
||||
from.SendLocalizedMessage(500269); // You cannot build that there.
|
||||
}
|
||||
else if (result == AddonFitResult.NotInHouse)
|
||||
{
|
||||
from.SendLocalizedMessage(
|
||||
1076192); // Statues can only be placed in houses where you are the owner or co-owner.
|
||||
}
|
||||
else if (result == AddonFitResult.DoorTooClose)
|
||||
{
|
||||
from.SendLocalizedMessage(500271); // You cannot build near the door.
|
||||
}
|
||||
else if (result == AddonFitResult.DoorTooClose) from.SendLocalizedMessage(500271); // You cannot build near the door.
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -630,15 +608,9 @@ namespace Server.Mobiles
|
|||
}
|
||||
}
|
||||
|
||||
public static AddonFitResult CouldFit(Point3D p, Map map, Mobile from, ref BaseHouse house)
|
||||
{
|
||||
if (!map.CanFit(p.X, p.Y, p.Z, 20, true))
|
||||
return AddonFitResult.Blocked;
|
||||
if (!BaseAddon.CheckHouse(from, p, map, 20, ref house))
|
||||
return AddonFitResult.NotInHouse;
|
||||
|
||||
return CheckDoors(p, 20, house);
|
||||
}
|
||||
public static AddonFitResult CouldFit(Point3D p, Map map, Mobile from, ref BaseHouse house) =>
|
||||
!map.CanFit(p.X, p.Y, p.Z, 20, true) ? AddonFitResult.Blocked :
|
||||
!BaseAddon.CheckHouse(from, p, map, 20, ref house) ? AddonFitResult.NotInHouse : CheckDoors(p, 20, house);
|
||||
|
||||
public static AddonFitResult CheckDoors(Point3D p, int height, BaseHouse house)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -66,9 +66,8 @@ namespace Server.Gumps
|
|||
}
|
||||
}
|
||||
|
||||
private int GetMaterialNumber(StatueType type, StatueMaterial material)
|
||||
{
|
||||
switch (material)
|
||||
private int GetMaterialNumber(StatueType type, StatueMaterial material) =>
|
||||
material switch
|
||||
{
|
||||
case StatueMaterial.Antique:
|
||||
|
||||
|
|
@ -126,7 +125,7 @@ namespace Server.Gumps
|
|||
|
||||
m_Maker?.Delete();
|
||||
|
||||
m_Statue.Sculpt(state.Mobile);
|
||||
m_Statue.Sculpt(sender.Mobile);
|
||||
}
|
||||
else if (info.ButtonID == (int)Buttons.PosePrev)
|
||||
{
|
||||
|
|
@ -174,11 +173,11 @@ namespace Server.Gumps
|
|||
}
|
||||
else // Close
|
||||
{
|
||||
sendGump = !m_Statue.Demolish(state.Mobile);
|
||||
sendGump = !m_Statue.Demolish(sender.Mobile);
|
||||
}
|
||||
|
||||
if (sendGump)
|
||||
state.Mobile.SendGump(new CharacterStatueGump(m_Maker, m_Statue, m_Owner));
|
||||
sender.Mobile.SendGump(new CharacterStatueGump(m_Maker, m_Statue, m_Owner));
|
||||
}
|
||||
|
||||
private enum Buttons
|
||||
|
|
|
|||
|
|
@ -1,20 +1,25 @@
|
|||
using Server.Buffers;
|
||||
|
||||
namespace Server.Network
|
||||
{
|
||||
public class UpdateStatueAnimation : Packet
|
||||
public static class StatuePackets
|
||||
{
|
||||
public UpdateStatueAnimation(Mobile m, int status, int animation, int frame) : base(0xBF, 17)
|
||||
public static void SendUpdateStatueAnimation(NetState ns, Serial m, int status, int animation, int frame)
|
||||
{
|
||||
m_Stream.Write((short)0x11);
|
||||
m_Stream.Write((short)0x19);
|
||||
m_Stream.Write((byte)0x5);
|
||||
m_Stream.Write(m.Serial);
|
||||
m_Stream.Write((byte)0);
|
||||
m_Stream.Write((byte)0xFF);
|
||||
m_Stream.Write((byte)status);
|
||||
m_Stream.Write((byte)0);
|
||||
m_Stream.Write((byte)animation);
|
||||
m_Stream.Write((byte)0);
|
||||
m_Stream.Write((byte)frame);
|
||||
if (ns == null)
|
||||
return;
|
||||
|
||||
SpanWriter writer = new SpanWriter(stackalloc byte[17]);
|
||||
writer.Write((byte)0xBF); // Extended Packet ID
|
||||
writer.Write((short)17); // Dynamic Length
|
||||
|
||||
writer.Write((short)0x19);
|
||||
writer.Write((byte)0x5);
|
||||
writer.Write(m);
|
||||
writer.Write((short)0xFF);
|
||||
writer.Write((byte)status);
|
||||
writer.Write((short)animation);
|
||||
writer.Write((short)frame);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Server.Network;
|
||||
|
||||
namespace Server.Gumps
|
||||
|
|
@ -51,17 +52,7 @@ namespace Server.Gumps
|
|||
m_Option.OnOptionSelected(sender.Mobile, info.ButtonID);
|
||||
}
|
||||
|
||||
private bool Contains(int chosen)
|
||||
{
|
||||
if (m_Options == null)
|
||||
return false;
|
||||
|
||||
foreach (RewardOption option in m_Options)
|
||||
if (option.ID == chosen)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
private bool Contains(int chosen) => m_Options?.Any(option => option.ID == chosen) == true;
|
||||
}
|
||||
|
||||
public class RewardOption
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue