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
|
|
@ -1,4 +1,5 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Server.ContextMenus;
|
||||
using Server.Mobiles;
|
||||
using Server.Multis;
|
||||
|
|
@ -16,40 +17,17 @@ namespace Server.Items
|
|||
{
|
||||
}
|
||||
|
||||
public override int DefaultMaxWeight
|
||||
{
|
||||
get
|
||||
{
|
||||
if (IsSecure)
|
||||
return 0;
|
||||
public override int DefaultMaxWeight => IsSecure ? 0 : base.DefaultMaxWeight;
|
||||
|
||||
return base.DefaultMaxWeight;
|
||||
}
|
||||
}
|
||||
public override bool IsAccessibleTo(Mobile m) =>
|
||||
BaseHouse.CheckAccessible(m, this) && base.IsAccessibleTo(m);
|
||||
|
||||
public override bool IsAccessibleTo(Mobile m)
|
||||
{
|
||||
if (!BaseHouse.CheckAccessible(m, this))
|
||||
return false;
|
||||
public override bool CheckHold(Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight) =>
|
||||
(!IsSecure || BaseHouse.CheckHold(m, this, item, message, checkItems, plusItems, plusWeight)) &&
|
||||
base.CheckHold(m, item, message, checkItems, plusItems, plusWeight);
|
||||
|
||||
return base.IsAccessibleTo(m);
|
||||
}
|
||||
|
||||
public override bool CheckHold(Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight)
|
||||
{
|
||||
if (IsSecure && !BaseHouse.CheckHold(m, this, item, message, checkItems, plusItems, plusWeight))
|
||||
return false;
|
||||
|
||||
return base.CheckHold(m, item, message, checkItems, plusItems, plusWeight);
|
||||
}
|
||||
|
||||
public override bool CheckItemUse(Mobile from, Item item)
|
||||
{
|
||||
if (IsDecoContainer && item is BaseBook)
|
||||
return true;
|
||||
|
||||
return base.CheckItemUse(from, item);
|
||||
}
|
||||
public override bool CheckItemUse(Mobile from, Item item) =>
|
||||
IsDecoContainer && item is BaseBook || base.CheckItemUse(from, item);
|
||||
|
||||
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
|
||||
{
|
||||
|
|
@ -79,13 +57,8 @@ namespace Server.Items
|
|||
|
||||
List<Item> list = Items;
|
||||
|
||||
for (int i = 0; i < list.Count; ++i)
|
||||
{
|
||||
Item item = list[i];
|
||||
|
||||
if (!(item is Container) && item.StackWith(from, dropped, false))
|
||||
return true;
|
||||
}
|
||||
if (list.Any(item => !(item is Container) && item.StackWith(from, dropped, false)))
|
||||
return true;
|
||||
|
||||
DropItem(dropped);
|
||||
|
||||
|
|
@ -936,4 +909,4 @@ namespace Server.Items
|
|||
Weight = -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Server.Mobiles;
|
||||
|
||||
namespace Server.Items
|
||||
|
|
@ -95,14 +96,7 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
public int GetItemsCount()
|
||||
{
|
||||
int count = 0;
|
||||
|
||||
foreach (Item item in Items) count += item.Amount;
|
||||
|
||||
return count;
|
||||
}
|
||||
public int GetItemsCount() => Items.Sum(item => item.Amount);
|
||||
|
||||
public void CheckRespawn()
|
||||
{
|
||||
|
|
@ -1507,7 +1501,9 @@ namespace Server.Items
|
|||
Mobile nearest = null;
|
||||
FillableContent content = null;
|
||||
|
||||
foreach (Mobile mob in map.GetMobilesInRange(loc, 20))
|
||||
IPooledEnumerable eable = map.GetMobilesInRange(loc, 20);
|
||||
|
||||
foreach (Mobile mob in eable)
|
||||
{
|
||||
if (nearest != null && mob.GetDistanceToSqrt(loc) > nearest.GetDistanceToSqrt(loc) &&
|
||||
!(nearest is Cobbler && mob is Provisioner))
|
||||
|
|
@ -1520,6 +1516,8 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
eable.Free();
|
||||
|
||||
return content;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -264,7 +264,7 @@ namespace Server.Items
|
|||
inaccessible = true;
|
||||
}
|
||||
|
||||
from.Send(new MessageLocalized(Serial, ItemID, MessageType.Regular, 0x3B2, 3, number, "", ""));
|
||||
Packets.SendMessageLocalized(from.NetState, Serial, ItemID, MessageType.Regular, 0x3B2, 3, number);
|
||||
}
|
||||
|
||||
return inaccessible;
|
||||
|
|
@ -323,4 +323,4 @@ namespace Server.Items
|
|||
LabelTo(from, 1041645); //recovered from a shipwreck
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -126,16 +126,11 @@ namespace Server.Items
|
|||
|
||||
#region Checks
|
||||
|
||||
private bool Resmeltables() //Where context menu checks for metal items and dragon barding deeds
|
||||
{
|
||||
foreach (Item i in Items)
|
||||
return i?.Deleted == false && (
|
||||
i is BaseWeapon weapon && CraftResources.GetType(weapon.Resource) == CraftResourceType.Metal ||
|
||||
i is BaseArmor armor && CraftResources.GetType(armor.Resource) == CraftResourceType.Metal ||
|
||||
i is DragonBardingDeed);
|
||||
|
||||
return false;
|
||||
}
|
||||
private bool Resmeltables() => //Where context menu checks for metal items and dragon barding deeds
|
||||
Items.Select(i => i?.Deleted == false &&
|
||||
(i is BaseWeapon weapon && CraftResources.GetType(weapon.Resource) == CraftResourceType.Metal ||
|
||||
i is BaseArmor armor && CraftResources.GetType(armor.Resource) == CraftResourceType.Metal ||
|
||||
i is DragonBardingDeed)).FirstOrDefault();
|
||||
|
||||
private bool Scissorables() //Where context menu checks for Leather items and cloth items
|
||||
{
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ namespace Server.Items
|
|||
if (Deleted || !to.CanSee(this))
|
||||
return;
|
||||
|
||||
to.Send(new MessageLocalized(Serial, ItemID, MessageType.Regular, hue, 3, number, "", ""));
|
||||
Packets.SendMessageLocalized(to.NetState, Serial, ItemID, MessageType.Regular, hue, 3, number);
|
||||
}
|
||||
|
||||
private void SendMessageTo(Mobile to, string text, int hue)
|
||||
|
|
@ -54,7 +54,7 @@ namespace Server.Items
|
|||
if (Deleted || !to.CanSee(this))
|
||||
return;
|
||||
|
||||
to.Send(new UnicodeMessage(Serial, ItemID, MessageType.Regular, hue, 3, "ENU", "", text));
|
||||
Packets.SendUnicodeMessage(to.NetState,Serial, ItemID, MessageType.Regular, hue, 3, "ENU", "", text);
|
||||
}
|
||||
|
||||
public virtual bool ExecuteTrap(Mobile from)
|
||||
|
|
@ -91,7 +91,7 @@ namespace Server.Items
|
|||
from.LocalOverheadMessage(MessageType.Regular, 0x2A, 503000);
|
||||
}
|
||||
|
||||
Effects.SendLocationEffect(loc, facet, 0x36BD, 15, 10);
|
||||
Effects.SendLocationEffect(loc, facet, 0x36BD, 15);
|
||||
Effects.PlaySound(loc, facet, 0x307);
|
||||
|
||||
break;
|
||||
|
|
@ -129,7 +129,7 @@ namespace Server.Items
|
|||
|
||||
AOS.Damage(from, damage, 100, 0, 0, 0, 0);
|
||||
|
||||
// A dart imbeds itself in your flesh!
|
||||
// A dart embeds itself in your flesh!
|
||||
from.LocalOverheadMessage(MessageType.Regular, 0x62, 502998);
|
||||
}
|
||||
|
||||
|
|
@ -221,4 +221,4 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Server.ContextMenus;
|
||||
using Server.Engines.PartySystem;
|
||||
using Server.Gumps;
|
||||
|
|
@ -39,7 +40,7 @@ namespace Server.Items
|
|||
|
||||
public override int LabelNumber => 3000541;
|
||||
|
||||
public static Type[] Artifacts{ get; } =
|
||||
public static Type[] Artifacts { get; } =
|
||||
{
|
||||
typeof(CandelabraOfSouls), typeof(GoldBricks), typeof(PhillipsWoodenSteed),
|
||||
typeof(ArcticDeathDealer), typeof(BlazeOfDeath), typeof(BurglarsBandana),
|
||||
|
|
@ -51,18 +52,18 @@ namespace Server.Items
|
|||
};
|
||||
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public int Level{ get; set; }
|
||||
public int Level { get; set; }
|
||||
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public Mobile Owner{ get; set; }
|
||||
public Mobile Owner { get; set; }
|
||||
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public DateTime DeleteTime{ get; private set; }
|
||||
public DateTime DeleteTime { get; private set; }
|
||||
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public bool Temporary{ get; set; }
|
||||
public bool Temporary { get; set; }
|
||||
|
||||
public List<Mobile> Guardians{ get; private set; }
|
||||
public List<Mobile> Guardians { get; private set; }
|
||||
|
||||
public override bool IsDecoContainer => false;
|
||||
|
||||
|
|
@ -196,18 +197,11 @@ namespace Server.Items
|
|||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
numberItems = level * 6;
|
||||
}
|
||||
|
||||
for (int i = 0; i < numberItems; ++i)
|
||||
{
|
||||
Item item;
|
||||
|
||||
if (Core.AOS)
|
||||
item = Loot.RandomArmorOrShieldOrWeaponOrJewelry();
|
||||
else
|
||||
item = Loot.RandomArmorOrShieldOrWeapon();
|
||||
Item item = Core.AOS ? Loot.RandomArmorOrShieldOrWeaponOrJewelry() : Loot.RandomArmorOrShieldOrWeapon();
|
||||
|
||||
if (item is BaseWeapon weapon)
|
||||
{
|
||||
|
|
@ -296,13 +290,12 @@ namespace Server.Items
|
|||
|
||||
if (Level == 0 && from.AccessLevel < AccessLevel.GameMaster)
|
||||
{
|
||||
foreach (Mobile m in Guardians)
|
||||
if (m.Alive)
|
||||
{
|
||||
from.SendLocalizedMessage(
|
||||
1046448); // You must first kill the guardians before you may open this chest.
|
||||
return true;
|
||||
}
|
||||
if (Guardians.Any(m => m.Alive))
|
||||
{
|
||||
from.SendLocalizedMessage(
|
||||
1046448); // You must first kill the guardians before you may open this chest.
|
||||
return true;
|
||||
}
|
||||
|
||||
LockPick(from);
|
||||
return false;
|
||||
|
|
@ -395,29 +388,29 @@ namespace Server.Items
|
|||
switch (version)
|
||||
{
|
||||
case 2:
|
||||
{
|
||||
Guardians = reader.ReadStrongMobileList();
|
||||
Temporary = reader.ReadBool();
|
||||
{
|
||||
Guardians = reader.ReadStrongMobileList();
|
||||
Temporary = reader.ReadBool();
|
||||
|
||||
goto case 1;
|
||||
}
|
||||
goto case 1;
|
||||
}
|
||||
case 1:
|
||||
{
|
||||
Owner = reader.ReadMobile();
|
||||
{
|
||||
Owner = reader.ReadMobile();
|
||||
|
||||
goto case 0;
|
||||
}
|
||||
goto case 0;
|
||||
}
|
||||
case 0:
|
||||
{
|
||||
Level = reader.ReadInt();
|
||||
DeleteTime = reader.ReadDeltaTime();
|
||||
m_Lifted = reader.ReadStrongItemList();
|
||||
{
|
||||
Level = reader.ReadInt();
|
||||
DeleteTime = reader.ReadDeltaTime();
|
||||
m_Lifted = reader.ReadStrongItemList();
|
||||
|
||||
if (version < 2)
|
||||
Guardians = new List<Mobile>();
|
||||
if (version < 2)
|
||||
Guardians = new List<Mobile>();
|
||||
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!Temporary)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue