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

126
Projects/Scripts/Mobiles/Vendors/BaseVendor.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Server.ContextMenus;
using Server.Engines.BulkOrders;
using Server.Factions;
@ -24,10 +25,10 @@ namespace Server.Mobiles
{
private const int MaxSell = 500;
private static TimeSpan InventoryDecayTime = TimeSpan.FromHours(1.0);
private static readonly TimeSpan InventoryDecayTime = TimeSpan.FromHours(1.0);
private List<IBuyItemInfo> m_ArmorBuyInfo = new List<IBuyItemInfo>();
private List<IShopSellInfo> m_ArmorSellInfo = new List<IShopSellInfo>();
private readonly List<IBuyItemInfo> m_ArmorBuyInfo = new List<IBuyItemInfo>();
private readonly List<IShopSellInfo> m_ArmorSellInfo = new List<IShopSellInfo>();
public BaseVendor(string title = null)
: base(AIType.AI_Vendor, FightMode.None, 2, 1, 0.5, 2)
@ -125,7 +126,6 @@ namespace Server.Mobiles
IShopSellInfo[] info = GetSellInfo();
int totalCost = 0;
List<BuyItemResponse> validBuy = new List<BuyItemResponse>(list.Count);
bool bought;
bool fromBank = false;
bool fullPurchase = true;
int controlSlots = buyer.FollowersMax - buyer.Followers;
@ -188,7 +188,7 @@ namespace Server.Mobiles
if (validBuy.Count == 0)
return false;
bought = buyer.AccessLevel >= AccessLevel.GameMaster;
bool bought = buyer.AccessLevel >= AccessLevel.GameMaster;
Container cont = buyer.Backpack;
if (!bought && cont != null)
@ -259,8 +259,9 @@ namespace Server.Mobiles
if (cont?.TryDropItem(buyer, buyItem, false) != true)
buyItem.MoveToWorld(buyer.Location, buyer.Map);
break;
}
if (cont?.TryDropItem(buyer, buyItem, false) != true)
buyItem.MoveToWorld(buyer.Location, buyer.Map);
}
}
}
else if (ser.IsMobile)
@ -309,10 +310,7 @@ namespace Server.Mobiles
public virtual bool OnSellItems(Mobile seller, List<SellItemResponse> list)
{
if (!IsActiveBuyer)
return false;
if (!seller.CheckAlive())
if (!(IsActiveBuyer && seller.CheckAlive()))
return false;
if (!CheckVendorAccess(seller))
@ -334,12 +332,7 @@ namespace Server.Mobiles
!resp.Item.Movable || resp.Item is Container container && container.Items.Count != 0)
continue;
foreach (IShopSellInfo ssi in info)
if (ssi.IsSellable(resp.Item))
{
Sold++;
break;
}
if (info.Any(ssi => ssi.IsSellable(resp.Item))) Sold++;
}
if (Sold > MaxSell)
@ -368,14 +361,11 @@ namespace Server.Mobiles
{
bool found = false;
foreach (IBuyItemInfo bii in buyInfo)
if (bii.Restock(resp.Item, amount))
{
resp.Item.Consume(amount);
found = true;
break;
}
if (buyInfo.Any(bii => bii.Restock(resp.Item, amount)))
{
resp.Item.Consume(amount);
found = true;
}
if (!found)
{
@ -522,11 +512,9 @@ namespace Server.Mobiles
if (CheckGargoyle())
return;
if (CheckNecromancer())
return;
public virtual int GetShoeHue() => 0.1 > Utility.RandomDouble() ? 0 : Utility.RandomNeutralHue();
CheckTokuno();
}
public virtual bool CheckMorph() => CheckGargoyle() || CheckNecromancer() || CheckTokuno();
public virtual bool CheckTokuno()
{
@ -548,12 +536,7 @@ namespace Server.Mobiles
public virtual bool CheckGargoyle()
{
Map map = Map;
if (map != Map.Ilshenar)
return false;
if (!Region.IsPartOf("Gargoyle City"))
if (!(Map == Map.Ilshenar && Region.IsPartOf("Gargoyle City")))
return false;
if (Body != 0x2F6 || (Hue & 0x8000) == 0)
@ -564,12 +547,7 @@ namespace Server.Mobiles
public virtual bool CheckNecromancer()
{
Map map = Map;
if (map != Map.Malas)
return false;
if (!Region.IsPartOf("Umbra"))
if (!(Map == Map.Malas && Region.IsPartOf("Umbra")))
return false;
if (Hue != 0x83E8)
@ -639,12 +617,10 @@ namespace Server.Mobiles
public virtual void CapitalizeTitle()
{
string title = Title;
if (title == null)
if (Title == null)
return;
string[] split = title.Split(' ');
string[] split = Title.Split(' ');
for (int i = 0; i < split.Length; ++i)
{
@ -730,10 +706,7 @@ namespace Server.Mobiles
public virtual void VendorBuy(Mobile from)
{
if (!IsActiveSeller)
return;
if (!from.CheckAlive())
if (!(IsActiveSeller && from.CheckAlive()))
return;
if (!CheckVendorAccess(from))
@ -824,25 +797,13 @@ namespace Server.Mobiles
NetState ns = from.NetState;
if (ns == null)
return;
if (ns.ContainerGridLines)
from.Send(new VendorBuyContent6017(list));
else
from.Send(new VendorBuyContent(list));
from.Send(new VendorBuyList(this, list));
if (ns.HighSeas)
from.Send(new DisplayBuyListHS(this));
else
from.Send(new DisplayBuyList(this));
from.Send(new MobileStatusExtended(from)); //make sure their gold amount is sent
Packets.SendVendorBuyContent(ns, list);
Packets.SendVendorBuyList(ns, this, list);
Packets.SendDisplayBuyList(ns, this.Serial);
Packets.SendMobileStatusExtended(ns, from); //make sure their gold amount is sent
for (int i = 0; i < opls.Count; ++i)
from.Send(opls[i]);
opls[i].Send(ns);
SayTo(from, 500186); // Greetings. Have a look around.
}
@ -857,12 +818,14 @@ namespace Server.Mobiles
AddItem(pack);
}
from.Send(new EquipUpdate(pack));
NetState ns = from.NetState;
Packets.SendEquipUpdate(ns, pack);
pack = FindItemOnLayer(Layer.ShopSell);
if (pack != null)
from.Send(new EquipUpdate(pack));
Packets.SendEquipUpdate(ns, pack);
pack = FindItemOnLayer(Layer.ShopResale);
@ -872,15 +835,12 @@ namespace Server.Mobiles
AddItem(pack);
}
from.Send(new EquipUpdate(pack));
Packets.SendEquipUpdate(ns, pack);
}
public virtual void VendorSell(Mobile from)
{
if (!IsActiveBuyer)
return;
if (!from.CheckAlive())
if (!(IsActiveBuyer && from.CheckAlive()))
return;
if (!CheckVendorAccess(from))
@ -911,13 +871,10 @@ namespace Server.Mobiles
if (list.Count > 0)
{
SendPacksTo(from);
from.Send(new VendorSellList(this, list));
Packets.SendVendorSellList(from.NetState, Serial, list);
}
else
{
Say(true, "You have nothing I would be interested in.");
}
}
public override bool OnDragDrop(Mobile from, Item dropped)
@ -992,7 +949,7 @@ namespace Server.Mobiles
return null;
}
private void ProcessSinglePurchase(BuyItemResponse buy, IBuyItemInfo bii, List<BuyItemResponse> validBuy,
private void ProcessSinglePurchase(BuyItemResponse buy, IBuyItemInfo bii, ICollection<BuyItemResponse> validBuy,
ref int controlSlots, ref bool fullPurchase, ref int totalCost)
{
int amount = buy.Amount;
@ -1006,9 +963,7 @@ namespace Server.Mobiles
int slots = bii.ControlSlots * amount;
if (controlSlots >= slots)
{
controlSlots -= slots;
}
else
{
fullPurchase = false;
@ -1185,10 +1140,9 @@ namespace Server.Mobiles
}
}
if (IsParagon)
IsParagon = false;
IsParagon = false;
Timer.DelayCall(TimeSpan.Zero, CheckMorph);
Timer.DelayCall(TimeSpan.Zero, () => CheckMorph());
}
public override void AddCustomContextEntries(Mobile from, List<ContextMenuEntry> list)
@ -1288,8 +1242,7 @@ namespace Server.ContextMenus
{
private BaseVendor m_Vendor;
public VendorBuyEntry(Mobile from, BaseVendor vendor)
: base(6103, 8)
public VendorBuyEntry(Mobile from, BaseVendor vendor) : base(6103, 8)
{
m_Vendor = vendor;
Enabled = vendor.CheckVendorAccess(from);
@ -1305,8 +1258,7 @@ namespace Server.ContextMenus
{
private BaseVendor m_Vendor;
public VendorSellEntry(Mobile from, BaseVendor vendor)
: base(6104, 8)
public VendorSellEntry(Mobile from, BaseVendor vendor) : base(6104, 8)
{
m_Vendor = vendor;
Enabled = vendor.CheckVendorAccess(from);