warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Cleanup/Housekeeping (#242)

Browse source
This commit is contained in:
Kamron Batman 2020-09-12 15:31:21 -07:00 • committed by GitHub
parent 90ede0659f
commit 741e8d8300
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
228 changed files with 6292 additions and 2690 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Projects/Server/Items/BaseMulti.cs
View file

@ -1,23 +1,3 @@
/***************************************************************************
* BaseMulti.cs
* -------------------
* begin : May 1, 2002
* copyright : (C) The RunUO Software Team
* email : info@runuo.com
*
* $Id$
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
using System;
namespace Server.Items
@ -60,7 +40,10 @@ namespace Server.Items
int id = mcl.List[0].ItemId;
if (id < 0x4000)
{
return 1020000 + id;
}
return 1078872 + id;
}
@ -129,8 +112,12 @@ namespace Server.Items
var version = reader.ReadInt();
if (version == 0)
{
if (ItemID >= 0x4000)
{
ItemID -= 0x4000;
}
}
}
}
}

296
Projects/Server/Items/Container.cs
View file

@ -1,23 +1,3 @@
/***************************************************************************
* Container.cs
* -------------------
* begin : May 1, 2002
* copyright : (C) The RunUO Software Team
* email : info@runuo.com
*
* $Id$
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
using System;
using System.Collections.Generic;
using System.IO;
@ -71,7 +51,9 @@ namespace Server.Items
get
{
if (m_ContainerData == null)
{
UpdateContainerData();
}
return m_ContainerData;
}
@ -89,7 +71,9 @@ namespace Server.Items
base.ItemID = value;
if (ItemID != oldID)
{
UpdateContainerData();
}
}
}
@ -123,7 +107,10 @@ namespace Server.Items
{
get
{
if (Parent is Container container && container.MaxWeight == 0) return 0;
if (Parent is Container container && container.MaxWeight == 0)
{
return 0;
}
return DefaultMaxWeight;
}
@ -206,7 +193,9 @@ namespace Server.Items
if (IsDecoContainer)
{
if (message)
{
SendCantStoreMessage(m, item);
}
return false;
}
@ -217,7 +206,9 @@ namespace Server.Items
TotalItems + plusItems + item.TotalItems + (item.IsVirtualItem ? 0 : 1) > maxItems)
{
if (message)
{
SendFullItemsMessage(m, item);
}
return false;
}
@ -225,7 +216,9 @@ namespace Server.Items
if (MaxWeight != 0 && TotalWeight + plusWeight + item.TotalWeight + item.PileWeight > MaxWeight)
{
if (message)
{
SendFullWeightMessage(m, item);
}
return false;
}
@ -236,10 +229,14 @@ namespace Server.Items
while (parent != null)
{
if (parent is Container container)
{
return container.CheckHold(m, item, message, checkItems, plusItems, plusWeight);
}
if (!(parent is Item parentItem))
{
break;
}
parent = parentItem.Parent;
}
@ -265,7 +262,9 @@ namespace Server.Items
public virtual bool OnDragDropInto(Mobile from, Item item, Point3D p)
{
if (!CheckHold(from, item, true, true))
{
return false;
}
item.Location = new Point3D(p.m_X, p.m_Y, 0);
AddItem(item);
@ -280,8 +279,12 @@ namespace Server.Items
var t = item.GetType();
for (var i = 0; i < types.Length; ++i)
{
if (types[i].IsAssignableFrom(t))
{
return true;
}
}
return false;
}
@ -289,7 +292,9 @@ namespace Server.Items
private static void SetSaveFlag(ref SaveFlag flags, SaveFlag toSet, bool setIf)
{
if (setIf)
{
flags |= toSet;
}
}
private static bool GetSaveFlag(SaveFlag flags, SaveFlag toGet) => (flags & toGet) != 0;
@ -310,13 +315,19 @@ namespace Server.Items
writer.Write((byte)flags);
if (GetSaveFlag(flags, SaveFlag.MaxItems))
{
writer.WriteEncodedInt(m_MaxItems);
}
if (GetSaveFlag(flags, SaveFlag.GumpID))
{
writer.WriteEncodedInt(m_GumpID);
}
if (GetSaveFlag(flags, SaveFlag.DropSound))
{
writer.WriteEncodedInt(m_DropSound);
}
}
public override void Deserialize(IGenericReader reader)
@ -332,19 +343,31 @@ namespace Server.Items
var flags = (SaveFlag)reader.ReadByte();
if (GetSaveFlag(flags, SaveFlag.MaxItems))
{
m_MaxItems = reader.ReadEncodedInt();
}
else
{
m_MaxItems = -1;
}
if (GetSaveFlag(flags, SaveFlag.GumpID))
{
m_GumpID = reader.ReadEncodedInt();
}
else
{
m_GumpID = -1;
}
if (GetSaveFlag(flags, SaveFlag.DropSound))
{
m_DropSound = reader.ReadEncodedInt();
}
else
{
m_DropSound = -1;
}
LiftOverride = GetSaveFlag(flags, SaveFlag.LiftOverride);
@ -358,19 +381,27 @@ namespace Server.Items
case 0:
{
if (version < 1)
{
m_MaxItems = GlobalMaxItems;
}
m_GumpID = reader.ReadInt();
m_DropSound = reader.ReadInt();
if (m_GumpID == DefaultGumpID)
{
m_GumpID = -1;
}
if (m_DropSound == DefaultDropSound)
{
m_DropSound = -1;
}
if (m_MaxItems == DefaultMaxItems)
{
m_MaxItems = -1;
}
// m_Bounds = new Rectangle2D( reader.ReadPoint2D(), reader.ReadPoint2D() );
reader.ReadPoint2D();
@ -397,6 +428,7 @@ namespace Server.Items
public override void UpdateTotal(Item sender, TotalType type, int delta)
{
if (sender != this && delta != 0 && !sender.IsVirtualItem)
{
switch (type)
{
case TotalType.Gold:
@ -413,6 +445,7 @@ namespace Server.Items
InvalidateProperties();
break;
}
}
base.UpdateTotal(sender, type, delta);
}
@ -426,7 +459,9 @@ namespace Server.Items
var items = m_Items;
if (items == null)
{
return;
}
for (var i = 0; i < items.Count; ++i)
{
@ -435,7 +470,9 @@ namespace Server.Items
item.UpdateTotals();
if (item.IsVirtualItem)
{
continue;
}
m_TotalGold += item.TotalGold;
m_TotalItems += item.TotalItems + 1;
@ -471,7 +508,9 @@ namespace Server.Items
if (!(item is Container) && CheckHold(from, dropped, false, false) &&
item.StackWith(from, dropped, playSound))
{
return true;
}
}
if (CheckHold(from, dropped, sendFullMessage, true))
@ -525,10 +564,14 @@ namespace Server.Items
if (dropItems.Count + stackItems.Count == droppedItems.Length) // All good
{
for (var i = 0; i < dropItems.Count; i++)
{
DropItem(dropItems[i]);
}
for (var i = 0; i < stackItems.Count; i++)
stackItems[i].m_StackItem.StackWith(from, stackItems[i].m_DropItem, false);
{
stackItems[i].m_StackItem.StackWith(@from, stackItems[i].m_DropItem, false);
}
return true;
}
@ -542,11 +585,13 @@ namespace Server.Items
var map = Map;
for (var i = Items.Count - 1; i >= 0; --i)
{
if (i < Items.Count)
{
Items[i].SetLastMoved();
Items[i].MoveToWorld(loc, map);
}
}
Delete();
}
@ -554,7 +599,9 @@ namespace Server.Items
public virtual void DropItem(Item dropped)
{
if (dropped == null)
{
return;
}
AddItem(dropped);
@ -564,14 +611,22 @@ namespace Server.Items
int x, y;
if (bounds.Width >= ourBounds.Width)
{
x = (ourBounds.Width - bounds.Width) / 2;
}
else
{
x = Utility.Random(ourBounds.Width - bounds.Width);
}
if (bounds.Height >= ourBounds.Height)
{
y = (ourBounds.Height - bounds.Height) / 2;
}
else
{
y = Utility.Random(ourBounds.Height - bounds.Height);
}
x += ourBounds.X;
x -= bounds.X;
@ -593,9 +648,13 @@ namespace Server.Items
if (trade != null)
{
if (trade.From.Mobile == from)
{
DisplayTo(trade.To.Mobile);
}
else if (trade.To.Mobile == from)
{
DisplayTo(trade.From.Mobile);
}
}
}
else
@ -614,7 +673,10 @@ namespace Server.Items
base.OnSingleClick(from);
if (CheckContentDisplay(from))
LabelTo(from, "({0} item{2}, {1} stones)", TotalItems, TotalWeight, TotalItems != 1 ? "s" : string.Empty);
{
LabelTo(@from, "({0} item{2}, {1} stones)", TotalItems, TotalWeight, TotalItems != 1 ? "s" : string.Empty);
}
// LabelTo( from, 1050044, String.Format( "{0}\t{1}", TotalItems.ToString(), TotalWeight.ToString() ) );
}
@ -634,9 +696,13 @@ namespace Server.Items
if (ns != null)
{
if (ns.HighSeas)
{
to.Send(new ContainerDisplayHS(Serial, GumpID));
}
else
{
to.Send(new ContainerDisplay(Serial, GumpID));
}
SendContentTo(ns);
@ -645,7 +711,9 @@ namespace Server.Items
var items = Items;
for (var i = 0; i < items.Count; ++i)
{
to.Send(items[i].OPLPacket);
}
}
}
}
@ -653,7 +721,9 @@ namespace Server.Items
public void ProcessOpeners(Mobile opener)
{
if (IsPublicContainer)
{
return;
}
var contains = false;
@ -675,7 +745,9 @@ namespace Server.Items
var range = GetUpdateRange(mob);
if (mob.Map != map || !mob.InRange(worldLoc, range))
{
Openers.RemoveAt(i--);
}
}
}
}
@ -695,12 +767,18 @@ namespace Server.Items
public virtual void SendContentTo(NetState state)
{
if (state == null)
{
return;
}
if (state.ContainerGridLines)
{
state.Send(new ContainerContent6017(state.Mobile, this));
}
else
{
state.Send(new ContainerContent(state.Mobile, this));
}
}
public override void GetProperties(ObjectPropertyList list)
@ -712,6 +790,7 @@ namespace Server.Items
if (Core.ML)
{
if (ParentsContain<BankBox>()) // Root Parent is the Mobile. Parent could be another containter.
{
list.Add(
1073841,
"{0}\t{1}\t{2}",
@ -719,7 +798,9 @@ namespace Server.Items
MaxItems,
TotalWeight
); // Contents: ~1_COUNT~/~2_MAXCOUNT~ items, ~3_WEIGHT~ stones
}
else
{
list.Add(
1072241,
"{0}\t{1}\t{2}\t{3}",
@ -728,6 +809,7 @@ namespace Server.Items
TotalWeight,
MaxWeight
); // Contents: ~1_COUNT~/~2_MAXCOUNT~ items, ~3_WEIGHT~/~4_MAXWEIGHT~ stones
}
// TODO: Where do the other clilocs come into play? 1073839 & 1073840?
}
@ -741,15 +823,21 @@ namespace Server.Items
public override void OnDoubleClick(Mobile from)
{
if (from.AccessLevel > AccessLevel.Player || from.InRange(GetWorldLocation(), 2))
DisplayTo(from);
{
DisplayTo(@from);
}
else
from.SendLocalizedMessage(500446); // That is too far away.
{
@from.SendLocalizedMessage(500446); // That is too far away.
}
}
public bool ConsumeTotalGrouped(Type type, int amount, bool recurse, OnItemConsumed callback, CheckItemGroup grouper)
{
if (grouper == null)
{
throw new ArgumentNullException(nameof(grouper));
}
var typedItems = FindItemsByType(type, recurse);
@ -769,9 +857,13 @@ namespace Server.Items
var v = grouper(a, b);
if (v == 0)
group.Add(b);
{
@group.Add(b);
}
else
{
break;
}
++idx;
}
@ -789,16 +881,23 @@ namespace Server.Items
items[i] = groups[i].ToArray();
for (var j = 0; j < items[i].Length; ++j)
{
totals[i] += items[i][j].Amount;
}
if (totals[i] >= amount)
{
hasEnough = true;
}
}
if (!hasEnough)
{
return false;
}
for (var i = 0; i < items.Length; ++i)
{
if (totals[i] >= amount)
{
var need = amount;
@ -827,6 +926,7 @@ namespace Server.Items
break;
}
}
return true;
}
@ -837,9 +937,14 @@ namespace Server.Items
)
{
if (types.Length != amounts.Length)
{
throw new ArgumentException("length of types and amounts must match");
}
if (grouper == null)
{
throw new ArgumentNullException(nameof(grouper));
}
var items = new Item[types.Length][][];
var totals = new int[types.Length][];
@ -864,9 +969,13 @@ namespace Server.Items
var v = grouper(a, b);
if (v == 0)
group.Add(b);
{
@group.Add(b);
}
else
{
break;
}
++idx;
}
@ -884,18 +993,26 @@ namespace Server.Items
items[i][j] = groups[j].ToArray();
for (var k = 0; k < items[i][j].Length; ++k)
{
totals[i][j] += items[i][j][k].Amount;
}
if (totals[i][j] >= amounts[i])
{
hasEnough = true;
}
}
if (!hasEnough)
{
return i;
}
}
for (var i = 0; i < items.Length; ++i)
{
for (var j = 0; j < items[i].Length; ++j)
{
if (totals[i][j] >= amounts[i])
{
var need = amounts[i];
@ -924,6 +1041,8 @@ namespace Server.Items
break;
}
}
}
return -1;
}
@ -934,9 +1053,14 @@ namespace Server.Items
)
{
if (types.Length != amounts.Length)
{
throw new ArgumentException("length of types and amounts must match");
}
if (grouper == null)
{
throw new ArgumentNullException(nameof(grouper));
}
var items = new Item[types.Length][][];
var totals = new int[types.Length][];
@ -961,9 +1085,13 @@ namespace Server.Items
var v = grouper(a, b);
if (v == 0)
group.Add(b);
{
@group.Add(b);
}
else
{
break;
}
++idx;
}
@ -981,18 +1109,26 @@ namespace Server.Items
items[i][j] = groups[j].ToArray();
for (var k = 0; k < items[i][j].Length; ++k)
{
totals[i][j] += items[i][j][k].Amount;
}
if (totals[i][j] >= amounts[i])
{
hasEnough = true;
}
}
if (!hasEnough)
{
return i;
}
}
for (var i = 0; i < items.Length; ++i)
{
for (var j = 0; j < items[i].Length; ++j)
{
if (totals[i][j] >= amounts[i])
{
var need = amounts[i];
@ -1021,6 +1157,8 @@ namespace Server.Items
break;
}
}
}
return -1;
}
@ -1028,7 +1166,9 @@ namespace Server.Items
public int ConsumeTotal(Type[][] types, int[] amounts, bool recurse = true, OnItemConsumed callback = null)
{
if (types.Length != amounts.Length)
{
throw new ArgumentException("length of types and amounts must match");
}
var items = new Item[types.Length][];
var totals = new int[types.Length];
@ -1038,10 +1178,14 @@ namespace Server.Items
items[i] = FindItemsByType(types[i], recurse);
for (var j = 0; j < items[i].Length; ++j)
{
totals[i] += items[i][j].Amount;
}
if (totals[i] < amounts[i])
{
return i;
}
}
for (var i = 0; i < types.Length; ++i)
@ -1077,7 +1221,9 @@ namespace Server.Items
public int ConsumeTotal(Type[] types, int[] amounts, bool recurse = true, OnItemConsumed callback = null)
{
if (types.Length != amounts.Length)
{
throw new ArgumentException("length of types and amounts must match");
}
var items = new Item[types.Length][];
var totals = new int[types.Length];
@ -1087,10 +1233,14 @@ namespace Server.Items
items[i] = FindItemsByType(types[i], recurse);
for (var j = 0; j < items[i].Length; ++j)
{
totals[i] += items[i][j].Amount;
}
if (totals[i] < amounts[i])
{
return i;
}
}
for (var i = 0; i < types.Length; ++i)
@ -1131,7 +1281,9 @@ namespace Server.Items
var total = 0;
for (var i = 0; i < items.Length; ++i)
{
total += items[i].Amount;
}
if (total >= amount)
{
@ -1175,7 +1327,9 @@ namespace Server.Items
RecurseConsumeUpTo(this, type, amount, recurse, ref consumed, toDelete);
while (toDelete.Count > 0)
{
toDelete.Dequeue().Delete();
}
return consumed;
}
@ -1186,7 +1340,9 @@ namespace Server.Items
)
{
if (current == null || current.Items.Count == 0)
{
return;
}
var list = current.Items;
@ -1222,7 +1378,9 @@ namespace Server.Items
public int GetBestGroupAmount(Type type, bool recurse, CheckItemGroup grouper)
{
if (grouper == null)
{
throw new ArgumentNullException(nameof(grouper));
}
var best = 0;
@ -1244,9 +1402,13 @@ namespace Server.Items
var v = grouper(a, b);
if (v == 0)
group.Add(b);
{
@group.Add(b);
}
else
{
break;
}
++idx;
}
@ -1261,10 +1423,14 @@ namespace Server.Items
var total = 0;
for (var j = 0; j < items.Length; ++j)
{
total += items[j].Amount;
}
if (total >= best)
{
best = total;
}
}
return best;
@ -1273,7 +1439,9 @@ namespace Server.Items
public int GetBestGroupAmount(Type[] types, bool recurse, CheckItemGroup grouper)
{
if (grouper == null)
{
throw new ArgumentNullException(nameof(grouper));
}
var best = 0;
@ -1295,9 +1463,13 @@ namespace Server.Items
var v = grouper(a, b);
if (v == 0)
group.Add(b);
{
@group.Add(b);
}
else
{
break;
}
++idx;
}
@ -1311,7 +1483,9 @@ namespace Server.Items
var total = items.Sum(t => t.Amount);
if (total >= best)
{
best = total;
}
}
return best;
@ -1320,7 +1494,9 @@ namespace Server.Items
public int GetBestGroupAmount(Type[][] types, bool recurse, CheckItemGroup grouper)
{
if (grouper == null)
{
throw new ArgumentNullException(nameof(grouper));
}
var best = 0;
@ -1344,9 +1520,13 @@ namespace Server.Items
var v = grouper(a, b);
if (v == 0)
group.Add(b);
{
@group.Add(b);
}
else
{
break;
}
++idx;
}
@ -1360,10 +1540,14 @@ namespace Server.Items
var total = 0;
for (var k = 0; k < items.Length; ++k)
{
total += items[k].Amount;
}
if (total >= best)
{
best = total;
}
}
}
@ -1377,7 +1561,9 @@ namespace Server.Items
public Item[] FindItemsByType(Type type, bool recurse = true)
{
if (m_FindItemsList.Count > 0)
{
m_FindItemsList.Clear();
}
RecurseFindItemsByType(this, type, recurse, m_FindItemsList);
@ -1387,7 +1573,9 @@ namespace Server.Items
private static void RecurseFindItemsByType(Item current, Type type, bool recurse, List<Item> list)
{
if (current == null || current.Items.Count == 0)
{
return;
}
var items = current.Items;
@ -1396,17 +1584,23 @@ namespace Server.Items
var item = items[i];
if (type.IsInstanceOfType(item))
{
list.Add(item);
}
if (recurse && item is Container)
{
RecurseFindItemsByType(item, type, true, list);
}
}
}
public Item[] FindItemsByType(Type[] types, bool recurse = true)
{
if (m_FindItemsList.Count > 0)
{
m_FindItemsList.Clear();
}
RecurseFindItemsByType(this, types, recurse, m_FindItemsList);
@ -1416,7 +1610,9 @@ namespace Server.Items
private static void RecurseFindItemsByType(Item current, Type[] types, bool recurse, List<Item> list)
{
if (current == null || current.Items.Count == 0)
{
return;
}
var items = current.Items;
@ -1425,10 +1621,14 @@ namespace Server.Items
var item = items[i];
if (InTypeList(item, types))
{
list.Add(item);
}
if (recurse && item is Container)
{
RecurseFindItemsByType(item, types, true, list);
}
}
}
@ -1437,7 +1637,9 @@ namespace Server.Items
private static Item RecurseFindItemByType(Item current, Type type, bool recurse)
{
if (current == null || current.Items.Count == 0)
{
return null;
}
var list = current.Items;
@ -1446,14 +1648,18 @@ namespace Server.Items
var item = list[i];
if (type.IsInstanceOfType(item))
{
return item;
}
if (recurse && item is Container)
{
var check = RecurseFindItemByType(item, type, true);
if (check != null)
{
return check;
}
}
}
@ -1465,7 +1671,9 @@ namespace Server.Items
private static Item RecurseFindItemByType(Item current, Type[] types, bool recurse)
{
if (current == null || current.Items.Count == 0)
{
return null;
}
var list = current.Items;
@ -1473,14 +1681,19 @@ namespace Server.Items
{
var item = list[i];
if (InTypeList(item, types)) return item;
if (InTypeList(item, types))
{
return item;
}
if (recurse && item is Container)
{
var check = RecurseFindItemByType(item, types, true);
if (check != null)
{
return check;
}
}
}
@ -1517,10 +1730,16 @@ namespace Server.Items
{
var container = queue.Dequeue();
foreach (var item in container.Items)
{
if (item is T typedItem && predicate?.Invoke(typedItem) != false)
{
items.Add(typedItem);
}
else if (recurse && item is Container itemContainer)
{
queue.Enqueue(itemContainer);
}
}
}
return items;
@ -1556,9 +1775,14 @@ namespace Server.Items
foreach (var item in container.Items)
{
if (item is T typedItem && predicate?.Invoke(typedItem) != false)
{
return typedItem;
}
if (recurse && item is Container itemContainer)
{
queue.Enqueue(itemContainer);
}
}
}
@ -1623,7 +1847,9 @@ namespace Server.Items
line = line.Trim();
if (line.Length == 0 || line.StartsWith("#"))
{
continue;
}
try
{
@ -1635,7 +1861,9 @@ namespace Server.Items
var aRect = split[1].Split(' ');
if (aRect.Length < 4)
{
continue;
}
var x = Utility.ToInt32(aRect[0]);
var y = Utility.ToInt32(aRect[1]);
@ -1659,9 +1887,13 @@ namespace Server.Items
var id = Utility.ToInt32(aIDs[i]);
if (m_Table.ContainsKey(id))
{
Console.WriteLine(@"Warning: double ItemID entry in Data\containers.cfg");
}
else
{
m_Table[id] = data;
}
}
}
}

28
Projects/Server/Items/Containers.cs
View file

@ -1,23 +1,3 @@
/***************************************************************************
* Containers.cs
* -------------------
* begin : May 1, 2002
* copyright : (C) The RunUO Software Team
* email : info@runuo.com
*
* $Id$
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
using Server.Accounting;
using Server.Network;
@ -88,14 +68,18 @@ namespace Server.Items
Opened = reader.ReadBool();
if (Owner == null)
{
Delete();
}
break;
}
}
if (ItemID == 0xE41)
{
ItemID = 0xE7C;
}
}
public void Close()
@ -103,7 +87,9 @@ namespace Server.Items
Opened = false;
if (SendDeleteOnClose)
{
Owner?.Send(RemovePacket);
}
}
public override void OnSingleClick(Mobile from)
@ -129,7 +115,9 @@ namespace Server.Items
public override int GetTotal(TotalType type)
{
if (AccountGold.Enabled && Owner?.Account != null && type == TotalType.Gold)
{
return Owner.Account.TotalGold;
}
return base.GetTotal(type);
}

4534
Projects/Server/Items/Item.cs Normal file
View file

File diff suppressed because it is too large Load diff

44
Projects/Server/Items/ItemBounds.cs Normal file
View file

@ -0,0 +1,44 @@
using System;
using System.IO;
namespace Server
{
public static class ItemBounds
{
static ItemBounds()
{
Table = new Rectangle2D[TileData.ItemTable.Length];
if (File.Exists("Data/Binary/Bounds.bin"))
{
using var fs = new FileStream(
"Data/Binary/Bounds.bin",
FileMode.Open,
FileAccess.Read,
FileShare.Read
);
var bin = new BinaryReader(fs);
var count = Math.Min(Table.Length, (int)(fs.Length / 8));
for (var i = 0; i < count; ++i)
{
int xMin = bin.ReadInt16();
int yMin = bin.ReadInt16();
int xMax = bin.ReadInt16();
int yMax = bin.ReadInt16();
Table[i].Set(xMin, yMin, xMax - xMin + 1, yMax - yMin + 1);
}
bin.Close();
}
else
{
Console.WriteLine("Warning: Data/Binary/Bounds.bin does not exist");
}
}
public static Rectangle2D[] Table { get; }
}
}

188
Projects/Server/Items/Layer.cs Normal file
View file

@ -0,0 +1,188 @@
/*************************************************************************
* ModernUO *
* Copyright 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: Layer.cs *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/
namespace Server
{
/// <summary>
/// Enumeration of item layer values.
/// </summary>
public enum Layer : byte
{
/// <summary>
/// Invalid layer.
/// </summary>
Invalid = 0x00,
/// <summary>
/// First valid layer. Equivalent to <c>Layer.OneHanded</c>.
/// </summary>
FirstValid = 0x01,
/// <summary>
/// One handed weapon.
/// </summary>
OneHanded = 0x01,
/// <summary>
/// Two handed weapon or shield.
/// </summary>
TwoHanded = 0x02,
/// <summary>
/// Shoes.
/// </summary>
Shoes = 0x03,
/// <summary>
/// Pants.
/// </summary>
Pants = 0x04,
/// <summary>
/// Shirts.
/// </summary>
Shirt = 0x05,
/// <summary>
/// Helmets, hats, and masks.
/// </summary>
Helm = 0x06,
/// <summary>
/// Gloves.
/// </summary>
Gloves = 0x07,
/// <summary>
/// Rings.
/// </summary>
Ring = 0x08,
/// <summary>
/// Talismans.
/// </summary>
Talisman = 0x09,
/// <summary>
/// Gorgets and necklaces.
/// </summary>
Neck = 0x0A,
/// <summary>
/// Hair.
/// </summary>
Hair = 0x0B,
/// <summary>
/// Half aprons.
/// </summary>
Waist = 0x0C,
/// <summary>
/// Torso, inner layer.
/// </summary>
InnerTorso = 0x0D,
/// <summary>
/// Bracelets.
/// </summary>
Bracelet = 0x0E,
/// <summary>
/// Unused.
/// </summary>
Unused_xF = 0x0F,
/// <summary>
/// Beards and mustaches.
/// </summary>
FacialHair = 0x10,
/// <summary>
/// Torso, outer layer.
/// </summary>
MiddleTorso = 0x11,
/// <summary>
/// Earings.
/// </summary>
Earrings = 0x12,
/// <summary>
/// Arms and sleeves.
/// </summary>
Arms = 0x13,
/// <summary>
/// Cloaks.
/// </summary>
Cloak = 0x14,
/// <summary>
/// Backpacks.
/// </summary>
Backpack = 0x15,
/// <summary>
/// Torso, outer layer.
/// </summary>
OuterTorso = 0x16,
/// <summary>
/// Leggings, outer layer.
/// </summary>
OuterLegs = 0x17,
/// <summary>
/// Leggings, inner layer.
/// </summary>
InnerLegs = 0x18,
/// <summary>
/// Last valid non-internal layer. Equivalent to <c>Layer.InnerLegs</c>.
/// </summary>
LastUserValid = 0x18,
/// <summary>
/// Mount item layer.
/// </summary>
Mount = 0x19,
/// <summary>
/// Vendor 'buy pack' layer.
/// </summary>
ShopBuy = 0x1A,
/// <summary>
/// Vendor 'resale pack' layer.
/// </summary>
ShopResale = 0x1B,
/// <summary>
/// Vendor 'sell pack' layer.
/// </summary>
ShopSell = 0x1C,
/// <summary>
/// Bank box layer.
/// </summary>
Bank = 0x1D,
/// <summary>
/// Last valid layer. Equivalent to <c>Layer.Bank</c>.
/// </summary>
LastValid = 0x1D
}
}

303
Projects/Server/Items/LightType.cs Normal file
View file

@ -0,0 +1,303 @@
/*************************************************************************
* ModernUO *
* Copyright 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: LightType.cs *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/
namespace Server
{
public enum LightType
{
/// <summary>
/// Window shape, arched, ray shining east.
/// </summary>
ArchedWindowEast,
/// <summary>
/// Medium circular shape.
/// </summary>
Circle225,
/// <summary>
/// Small circular shape.
/// </summary>
Circle150,
/// <summary>
/// Door shape, shining south.
/// </summary>
DoorSouth,
/// <summary>
/// Door shape, shining east.
/// </summary>
DoorEast,
/// <summary>
/// Large semicircular shape (180 degrees), north wall.
/// </summary>
NorthBig,
/// <summary>
/// Large pie shape (90 degrees), north-east corner.
/// </summary>
NorthEastBig,
/// <summary>
/// Large semicircular shape (180 degrees), east wall.
/// </summary>
EastBig,
/// <summary>
/// Large semicircular shape (180 degrees), west wall.
/// </summary>
WestBig,
/// <summary>
/// Large pie shape (90 degrees), south-west corner.
/// </summary>
SouthWestBig,
/// <summary>
/// Large semicircular shape (180 degrees), south wall.
/// </summary>
SouthBig,
/// <summary>
/// Medium semicircular shape (180 degrees), north wall.
/// </summary>
NorthSmall,
/// <summary>
/// Medium pie shape (90 degrees), north-east corner.
/// </summary>
NorthEastSmall,
/// <summary>
/// Medium semicircular shape (180 degrees), east wall.
/// </summary>
EastSmall,
/// <summary>
/// Medium semicircular shape (180 degrees), west wall.
/// </summary>
WestSmall,
/// <summary>
/// Medium semicircular shape (180 degrees), south wall.
/// </summary>
SouthSmall,
/// <summary>
/// Shaped like a wall decoration, north wall.
/// </summary>
DecorationNorth,
/// <summary>
/// Shaped like a wall decoration, north-east corner.
/// </summary>
DecorationNorthEast,
/// <summary>
/// Small semicircular shape (180 degrees), east wall.
/// </summary>
EastTiny,
/// <summary>
/// Shaped like a wall decoration, west wall.
/// </summary>
DecorationWest,
/// <summary>
/// Shaped like a wall decoration, south-west corner.
/// </summary>
DecorationSouthWest,
/// <summary>
/// Small semicircular shape (180 degrees), south wall.
/// </summary>
SouthTiny,
/// <summary>
/// Window shape, rectangular, no ray, shining south.
/// </summary>
RectWindowSouthNoRay,
/// <summary>
/// Window shape, rectangular, no ray, shining east.
/// </summary>
RectWindowEastNoRay,
/// <summary>
/// Window shape, rectangular, ray shining south.
/// </summary>
RectWindowSouth,
/// <summary>
/// Window shape, rectangular, ray shining east.
/// </summary>
RectWindowEast,
/// <summary>
/// Window shape, arched, no ray, shining south.
/// </summary>
ArchedWindowSouthNoRay,
/// <summary>
/// Window shape, arched, no ray, shining east.
/// </summary>
ArchedWindowEastNoRay,
/// <summary>
/// Window shape, arched, ray shining south.
/// </summary>
ArchedWindowSouth,
/// <summary>
/// Large circular shape.
/// </summary>
Circle300,
/// <summary>
/// Large pie shape (90 degrees), north-west corner.
/// </summary>
NorthWestBig,
/// <summary>
/// Negative light. Medium pie shape (90 degrees), south-east corner.
/// </summary>
DarkSouthEast,
/// <summary>
/// Negative light. Medium semicircular shape (180 degrees), south wall.
/// </summary>
DarkSouth,
/// <summary>
/// Negative light. Medium pie shape (90 degrees), north-west corner.
/// </summary>
DarkNorthWest,
/// <summary>
/// Negative light. Medium pie shape (90 degrees), south-east corner. Equivalent to <c>LightType.SouthEast</c>.
/// </summary>
DarkSouthEast2,
/// <summary>
/// Negative light. Medium circular shape (180 degrees), east wall.
/// </summary>
DarkEast,
/// <summary>
/// Negative light. Large circular shape.
/// </summary>
DarkCircle300,
/// <summary>
/// Opened door shape, shining south.
/// </summary>
DoorOpenSouth,
/// <summary>
/// Opened door shape, shining east.
/// </summary>
DoorOpenEast,
/// <summary>
/// Window shape, square, ray shining east.
/// </summary>
SquareWindowEast,
/// <summary>
/// Window shape, square, no ray, shining east.
/// </summary>
SquareWindowEastNoRay,
/// <summary>
/// Window shape, square, ray shining south.
/// </summary>
SquareWindowSouth,
/// <summary>
/// Window shape, square, no ray, shining south.
/// </summary>
SquareWindowSouthNoRay,
/// <summary>
/// Empty.
/// </summary>
Empty,
/// <summary>
/// Window shape, skinny, no ray, shining south.
/// </summary>
SkinnyWindowSouthNoRay,
/// <summary>
/// Window shape, skinny, ray shining east.
/// </summary>
SkinnyWindowEast,
/// <summary>
/// Window shape, skinny, no ray, shining east.
/// </summary>
SkinnyWindowEastNoRay,
/// <summary>
/// Shaped like a hole, shining south.
/// </summary>
HoleSouth,
/// <summary>
/// Shaped like a hole, shining south.
/// </summary>
HoleEast,
/// <summary>
/// Large circular shape with a moongate graphic embedded.
/// </summary>
Moongate,
/// <summary>
/// Unknown usage. Many rows of slightly angled lines.
/// </summary>
Strips,
/// <summary>
/// Shaped like a small hole, shining south.
/// </summary>
SmallHoleSouth,
/// <summary>
/// Shaped like a small hole, shining east.
/// </summary>
SmallHoleEast,
/// <summary>
/// Large semicircular shape (180 degrees), north wall. Identical graphic as <c>LightType.NorthBig</c>, but slightly
/// different
/// positioning.
/// </summary>
NorthBig2,
/// <summary>
/// Large semicircular shape (180 degrees), west wall. Identical graphic as <c>LightType.WestBig</c>, but slightly different
/// positioning.
/// </summary>
WestBig2,
/// <summary>
/// Large pie shape (90 degrees), north-west corner. Equivalent to <c>LightType.NorthWestBig</c>.
/// </summary>
NorthWestBig2
}
}

39
Projects/Server/Items/SecureTradeContainer.cs
View file

@ -1,23 +1,3 @@
/***************************************************************************
* SecureTradeContainer.cs
* -------------------
* begin : May 1, 2002
* copyright : (C) The RunUO Software Team
* email : info@runuo.com
*
* $Id$
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
using Server.Accounting;
using Server.Network;
@ -40,7 +20,10 @@ namespace Server.Items
public override bool CheckHold(Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight)
{
if (item == Trade.From.VirtualCheck || item == Trade.To.VirtualCheck) return true;
if (item == Trade.From.VirtualCheck || item == Trade.To.VirtualCheck)
{
return true;
}
var to = Trade.From.Container != this ? Trade.From.Mobile : Trade.To.Mobile;
@ -59,37 +42,51 @@ namespace Server.Items
public override void OnItemAdded(Item item)
{
if (!(item is VirtualCheck))
{
ClearChecks();
}
}
public override void OnItemRemoved(Item item)
{
if (!(item is VirtualCheck))
{
ClearChecks();
}
}
public override void OnSubItemAdded(Item item)
{
if (!(item is VirtualCheck))
{
ClearChecks();
}
}
public override void OnSubItemRemoved(Item item)
{
if (!(item is VirtualCheck))
{
ClearChecks();
}
}
public void ClearChecks()
{
if (Trade == null)
{
return;
}
if (Trade.From?.IsDisposed == false)
{
Trade.From.Accepted = false;
}
if (Trade.To?.IsDisposed == false)
{
Trade.To.Accepted = false;
}
Trade.Update();
}

35
Projects/Server/Items/VirtualCheck.cs
View file

@ -1,6 +1,6 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2020 - ModernUO Development Team *
* Copyright 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: VirtualCheck.cs *
* *
@ -78,7 +78,10 @@ namespace Server.Items
{
var c = GetSecureTradeCont();
if (check == null || c == null) return base.IsAccessibleTo(check);
if (check == null || c == null)
{
return base.IsAccessibleTo(check);
}
return c.RootParent == check && IsChildOf(c);
}
@ -125,11 +128,19 @@ namespace Server.Items
{
var c = GetSecureTradeCont();
if (c?.Trade == null) return;
if (c?.Trade == null)
{
return;
}
if (user == c.Trade.From.Mobile)
{
c.Trade.UpdateFromCurrency();
else if (user == c.Trade.To.Mobile) c.Trade.UpdateToCurrency();
}
else if (user == c.Trade.To.Mobile)
{
c.Trade.UpdateToCurrency();
}
c.ClearChecks();
}
@ -194,7 +205,9 @@ namespace Server.Items
base.OnServerClose(owner);
if (Check?.Deleted == false)
{
Check.UpdateTrade(User);
}
}
public void Close()
@ -202,17 +215,25 @@ namespace Server.Items
User.CloseGump<EditGump>();
if (Check?.Deleted == false)
{
Check.UpdateTrade(User);
}
else
{
Check = null;
}
}
public void Send()
{
if (Check?.Deleted == false)
{
User.SendGump(this);
}
else
{
Close();
}
}
public void Refresh(bool recompile)
@ -224,7 +245,9 @@ namespace Server.Items
}
if (recompile)
{
CompileLayout();
}
Close();
Send();
@ -233,7 +256,9 @@ namespace Server.Items
private void CompileLayout()
{
if (Check?.Deleted != false)
{
return;
}
Entries.ForEach(e => e.Parent = null);
Entries.Clear();
@ -353,7 +378,9 @@ namespace Server.Items
}
if (updated)
{
User.SendMessage("Your offer has been updated.");
}
if (refresh && Check?.Deleted == false)
{

20
Projects/Server/Items/VirtualHair.cs
View file

@ -1,23 +1,3 @@
/***************************************************************************
* VirtualHair.cs
* -------------------
* begin : May 1, 2002
* copyright : (C) The RunUO Software Team
* email : info@runuo.com
*
* $Id$
*
***************************************************************************/
/***************************************************************************
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
using Server.Network;
namespace Server