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
|
|
@ -135,9 +135,9 @@ namespace Server.Items
|
|||
{
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
Mobile from = state.Mobile;
|
||||
Mobile from = sender.Mobile;
|
||||
|
||||
if (info.ButtonID == 1 || info.ButtonID == 2)
|
||||
{
|
||||
|
|
@ -147,9 +147,10 @@ namespace Server.Items
|
|||
return;
|
||||
}
|
||||
|
||||
if (from is PlayerMobile mobile) mobile.AnkhNextUse = DateTime.UtcNow + TimeSpan.FromHours(1);
|
||||
if (from is PlayerMobile mobile)
|
||||
mobile.AnkhNextUse = DateTime.UtcNow + TimeSpan.FromHours(1);
|
||||
|
||||
base.OnResponse(state, info);
|
||||
base.OnResponse(sender, info);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,8 +63,7 @@ namespace Server.Items
|
|||
|
||||
public void TurnOn()
|
||||
{
|
||||
if (m_Fire == null)
|
||||
m_Fire = new Item();
|
||||
m_Fire ??= new Item();
|
||||
|
||||
m_Fire.ItemID = 0x19AB;
|
||||
m_Fire.Movable = false;
|
||||
|
|
|
|||
|
|
@ -63,37 +63,37 @@ namespace Server.Items
|
|||
switch (direction)
|
||||
{
|
||||
case CannonDirection.North:
|
||||
{
|
||||
AddComponent(new CannonAddonComponent(0xE8D), 0, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE8C), 0, 1, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE8B), 0, 2, 0);
|
||||
{
|
||||
AddComponent(new CannonAddonComponent(0xE8D), 0, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE8C), 0, 1, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE8B), 0, 2, 0);
|
||||
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CannonDirection.East:
|
||||
{
|
||||
AddComponent(new CannonAddonComponent(0xE96), 0, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE95), -1, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE94), -2, 0, 0);
|
||||
{
|
||||
AddComponent(new CannonAddonComponent(0xE96), 0, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE95), -1, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE94), -2, 0, 0);
|
||||
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case CannonDirection.South:
|
||||
{
|
||||
AddComponent(new CannonAddonComponent(0xE91), 0, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE92), 0, -1, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE93), 0, -2, 0);
|
||||
{
|
||||
AddComponent(new CannonAddonComponent(0xE91), 0, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE92), 0, -1, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE93), 0, -2, 0);
|
||||
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
AddComponent(new CannonAddonComponent(0xE8E), 0, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE8F), 1, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE90), 2, 0, 0);
|
||||
{
|
||||
AddComponent(new CannonAddonComponent(0xE8E), 0, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE8F), 1, 0, 0);
|
||||
AddComponent(new CannonAddonComponent(0xE90), 2, 0, 0);
|
||||
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -114,7 +114,7 @@ namespace Server.Items
|
|||
}
|
||||
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public CannonDirection CannonDirection{ get; private set; }
|
||||
public CannonDirection CannonDirection { get; private set; }
|
||||
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public int Charges
|
||||
|
|
@ -261,34 +261,19 @@ namespace Server.Items
|
|||
{
|
||||
if (!Utility.InRange(new Point3D(p), m_Cannon.Location, 2))
|
||||
{
|
||||
bool allow = false;
|
||||
|
||||
int x = p.X - m_Cannon.X;
|
||||
int y = p.Y - m_Cannon.Y;
|
||||
|
||||
switch (m_Cannon.CannonDirection)
|
||||
bool allow = m_Cannon.CannonDirection switch
|
||||
{
|
||||
case CannonDirection.North:
|
||||
if (y < 0 && Math.Abs(x) <= -y / 3)
|
||||
allow = true;
|
||||
|
||||
break;
|
||||
case CannonDirection.East:
|
||||
if (x > 0 && Math.Abs(y) <= x / 3)
|
||||
allow = true;
|
||||
|
||||
break;
|
||||
case CannonDirection.South:
|
||||
if (y > 0 && Math.Abs(x) <= y / 3)
|
||||
allow = true;
|
||||
|
||||
break;
|
||||
case CannonDirection.West:
|
||||
if (x < 0 && Math.Abs(y) <= -x / 3)
|
||||
allow = true;
|
||||
|
||||
break;
|
||||
}
|
||||
CannonDirection.North => y < 0 && Math.Abs(x) <= -y / 3,
|
||||
CannonDirection.East => x > 0 && Math.Abs(y) <= x / 3,
|
||||
CannonDirection.South => y > 0 && Math.Abs(x) <= y / 3,
|
||||
CannonDirection.West => x < 0 && Math.Abs(y) <= -x / 3,
|
||||
_ => false,
|
||||
};
|
||||
|
||||
if (allow && Utility.InRange(new Point3D(p), m_Cannon.Location, 14))
|
||||
m_Cannon.DoFireEffect(p);
|
||||
|
|
@ -301,9 +286,7 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendLocalizedMessage(1049630); // You cannot see that target!
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnTargetOutOfRange(Mobile from, object targeted)
|
||||
|
|
@ -341,10 +324,10 @@ namespace Server.Items
|
|||
AddHtmlLocalized(195, 109, 120, 20, 1076197, 0x7FFF); // Recharge
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
if (m_Cannon?.Deleted == false && info.ButtonID == (int)Buttons.Recharge)
|
||||
m_Cannon.Fill(state.Mobile, m_Keg);
|
||||
m_Cannon.Fill(sender.Mobile, m_Keg);
|
||||
}
|
||||
|
||||
private enum Buttons
|
||||
|
|
@ -373,7 +356,8 @@ namespace Server.Items
|
|||
|
||||
public override BaseAddon Addon => new CannonAddon(m_Direction)
|
||||
{
|
||||
Charges = m_Charges, IsRewardItem = m_IsRewardItem
|
||||
Charges = m_Charges,
|
||||
IsRewardItem = m_IsRewardItem
|
||||
};
|
||||
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@ namespace Server.Items
|
|||
AddTextEntry(75, 245, 350, 40, 0x0, (int)Buttons.Text, "");
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
if (m_Tool?.Deleted != false || m_Target?.Deleted != false)
|
||||
return;
|
||||
|
|
@ -319,12 +319,12 @@ namespace Server.Items
|
|||
AddHtmlLocalized(40, 109, 100, 20, 1060051, 0x7FFF); // CANCEL
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
if (m_Engraver?.Deleted != false || info.ButtonID != (int)Buttons.Confirm)
|
||||
return;
|
||||
|
||||
m_Engraver.Recharge(state.Mobile, m_Guildmaster);
|
||||
m_Engraver.Recharge(sender.Mobile, m_Guildmaster);
|
||||
}
|
||||
|
||||
private enum Buttons
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue