fix: Optimizes FindItemsByType by removing allocations. (#1515)
### Summary Container enumeration is in dire need of optimization. Thanks to @stefanomerotta for initiating this work with PR #1443. This PR handles a small part of what Stefan started. Also included are some bug fixes. ### Method Signatures ```cs // Use with foreach without moving/deleting items FindItemsByTypeEnumerator<T> FindItemsByType<T>(bool recurse = true, Predicate<T> predicate = null) // Use with foreach when moving/deleting items QueuedItemsEnumerator<T> EnumerateItemsByType<T>(bool recurse = true, Predicate<T> predicate = null) // Use when iterating multiple times or queuing PooledRefQueue<T> QueueItemsByType<T>(bool recurse = true, Predicate<T> predicate = null) // Use when iterating multiples times or manipulating elements without traversing PooledRefList<T> ListItemsByType<T>(bool recurse = true, Predicate<T> predicate = null) ``` * `FindItemsByType<T>` has changed from returning `List<T>` to `FindItemsByTypeEnumerator<T>` - This method is not safe to use in situations where an item may get consumed, deleted, or moved. * `EnumerateItemsByType<T>` was added as a safe way to iterate and manipulate items. * **Note**: EnumerateItemsByType will _completely traverse the container_ before iteration starts because it uses `QueueItemsByType` under the hood. * `QueueItemsByType<T>` and `ListItemsByType<T>` was added to return a queue or list of items to iterate multiple times and manipulate the items. This isn't the most efficient since it uses a predicate and can result in 2 or 3 total iterations unnecessarily. ### Bug Fixes - [X] Fishing had an error in the random check that may have caused slight bias.
This commit is contained in:
parent
146abad36e
commit
a4cabe2fa4
23 changed files with 655 additions and 390 deletions
73
Projects/Server.Tests/Tests/Items/ContainerTests.cs
Normal file
73
Projects/Server.Tests/Tests/Items/ContainerTests.cs
Normal file
|
|
@ -0,0 +1,73 @@
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Server.Items;
|
||||||
|
using Xunit;
|
||||||
|
|
||||||
|
namespace Server.Tests;
|
||||||
|
|
||||||
|
public class ContainerTests : IClassFixture<ServerFixture>
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public void TestFindItemsByType()
|
||||||
|
{
|
||||||
|
var staticSerial = (Serial)0x3;
|
||||||
|
|
||||||
|
var container = new Container((Serial)0x1);
|
||||||
|
container.AddItem(new Item((Serial)0x2));
|
||||||
|
container.AddItem(new Static(staticSerial));
|
||||||
|
|
||||||
|
Static staticItem = null;
|
||||||
|
foreach (var item in container.FindItemsByType<Static>())
|
||||||
|
{
|
||||||
|
staticItem = item;
|
||||||
|
}
|
||||||
|
|
||||||
|
Assert.NotNull(staticItem);
|
||||||
|
Assert.Equal(staticSerial, staticItem.Serial);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void TestFindItemsByTypeNested()
|
||||||
|
{
|
||||||
|
var static1 = new Static((Serial)0x3);
|
||||||
|
var static2 = new Static((Serial)0x6);
|
||||||
|
|
||||||
|
var container = new Container((Serial)0x1);
|
||||||
|
container.AddItem(new Item((Serial)0x2));
|
||||||
|
var container2 = new Container((Serial)0x4);
|
||||||
|
container.AddItem(container2);
|
||||||
|
|
||||||
|
var container3 = new Container((Serial)0x5);
|
||||||
|
container2.AddItem(container3);
|
||||||
|
container3.AddItem(static2);
|
||||||
|
|
||||||
|
container2.AddItem(static1);
|
||||||
|
|
||||||
|
List<Static> statics = new List<Static>();
|
||||||
|
foreach (var item in container.FindItemsByType<Static>())
|
||||||
|
{
|
||||||
|
statics.Add(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
Assert.Equal(2, statics.Count);
|
||||||
|
Assert.Equal(static1, statics[0]);
|
||||||
|
Assert.Equal(static2, statics[1]);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void TestFindItemsByTypeNotMatching()
|
||||||
|
{
|
||||||
|
var container = new Container((Serial)0x1);
|
||||||
|
container.AddItem(new Item((Serial)0x2));
|
||||||
|
var container2 = new Container((Serial)0x4);
|
||||||
|
container.AddItem(container2);
|
||||||
|
container2.AddItem(new Item((Serial)0x5));
|
||||||
|
|
||||||
|
Static staticItem = null;
|
||||||
|
foreach (var item in container.FindItemsByType<Static>())
|
||||||
|
{
|
||||||
|
staticItem = item;
|
||||||
|
}
|
||||||
|
|
||||||
|
Assert.Null(staticItem);
|
||||||
|
}
|
||||||
|
}
|
||||||
243
Projects/Server/Items/Container.Enumerable.cs
Normal file
243
Projects/Server/Items/Container.Enumerable.cs
Normal file
|
|
@ -0,0 +1,243 @@
|
||||||
|
/*************************************************************************
|
||||||
|
* ModernUO *
|
||||||
|
* Copyright 2019-2023 - ModernUO Development Team *
|
||||||
|
* Email: hi@modernuo.com *
|
||||||
|
* File: Container.Enumerable.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/>. *
|
||||||
|
*************************************************************************/
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using Server.Collections;
|
||||||
|
|
||||||
|
namespace Server.Items;
|
||||||
|
|
||||||
|
public partial class Container
|
||||||
|
{
|
||||||
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
|
public FindItemsByTypeEnumerator<Item> FindItemsByType(bool recurse = true, Predicate<Item> predicate = null)
|
||||||
|
=> FindItemsByType<Item>(recurse, predicate);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Performs a breadth-first search through all the <see cref="Item" />s and
|
||||||
|
/// nested <see cref="Container" />s within this <see cref="Container" />.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// DO NOT consume, delete, or move items while iterating
|
||||||
|
/// </remarks>
|
||||||
|
/// <example>
|
||||||
|
/// <code>
|
||||||
|
/// var total = 0;
|
||||||
|
/// foreach (var gold in cont.FindItemsByType<Gold>())
|
||||||
|
/// {
|
||||||
|
/// total += gold.Amount;
|
||||||
|
/// }
|
||||||
|
/// </code>
|
||||||
|
/// </example>
|
||||||
|
/// <typeparam name="T">Type of objects being searched for</typeparam>
|
||||||
|
/// <param name="recurse">
|
||||||
|
/// Optional: If true, the search will recursively
|
||||||
|
/// check any nested <see cref="Container" />s; otherwise, nested
|
||||||
|
/// <see cref="Container" />s will not be searched.
|
||||||
|
/// </param>
|
||||||
|
/// <param name="predicate">
|
||||||
|
/// Optional: A predicate to check if the <see cref="Item" />
|
||||||
|
/// of type <typeparamref name="T" /> is one of the targets of the search.
|
||||||
|
/// </param>
|
||||||
|
/// <returns>
|
||||||
|
/// An enumerator for iterating through <see cref="Item" />s of type <typeparamref name="T" /> that match the optional
|
||||||
|
/// <paramref name="predicate" />.
|
||||||
|
/// </returns>
|
||||||
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
|
public FindItemsByTypeEnumerator<T> FindItemsByType<T>(bool recurse = true, Predicate<T> predicate = null)
|
||||||
|
where T : Item => new(this, recurse, predicate);
|
||||||
|
|
||||||
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
|
public QueuedItemsEnumerator<Item> EnumerateItemsByType(bool recurse = true, Predicate<Item> predicate = null)
|
||||||
|
=> EnumerateItemsByType<Item>(recurse, predicate);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Safely enumerates items using a breadth-first search through all the <see cref="Item" />s and
|
||||||
|
/// nested <see cref="Container" />s within this <see cref="Container" />.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// Use EnumerateItemsByType for situations where the item might be manipulated, consumed, or moved.
|
||||||
|
/// Note: This method scans through the container before returning the enumerator for iteration.
|
||||||
|
/// </remarks>
|
||||||
|
/// <example>
|
||||||
|
/// <code>
|
||||||
|
/// foreach (var item in cont.EnumerateItemsByType<Item>())
|
||||||
|
/// {
|
||||||
|
/// if (item.LootType is not LootType.Blessed)
|
||||||
|
/// {
|
||||||
|
/// item.Delete();
|
||||||
|
/// }
|
||||||
|
/// }
|
||||||
|
/// </code>
|
||||||
|
/// </example>
|
||||||
|
/// <typeparam name="T">Type of objects being searched for</typeparam>
|
||||||
|
/// <param name="recurse">
|
||||||
|
/// Optional: If true, the search will recursively
|
||||||
|
/// check any nested <see cref="Container" />s; otherwise, nested
|
||||||
|
/// <see cref="Container" />s will not be searched.
|
||||||
|
/// </param>
|
||||||
|
/// <param name="predicate">
|
||||||
|
/// Optional: A predicate to check if the <see cref="Item" />
|
||||||
|
/// of type <typeparamref name="T" /> is one of the targets of the search.
|
||||||
|
/// </param>
|
||||||
|
/// <returns>
|
||||||
|
/// An enumerator for iterating through <see cref="Item" />s of type <typeparamref name="T" /> that match the optional
|
||||||
|
/// <paramref name="predicate" />.
|
||||||
|
/// </returns>
|
||||||
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
|
public QueuedItemsEnumerator<T> EnumerateItemsByType<T>(bool recurse = true, Predicate<T> predicate = null)
|
||||||
|
where T : Item => new(QueueItemsByType(recurse, predicate));
|
||||||
|
|
||||||
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
|
public PooledRefQueue<Item> QueueItemsByType(bool recurse = true, Predicate<Item> predicate = null) =>
|
||||||
|
QueueItemsByType<Item>(recurse, predicate);
|
||||||
|
|
||||||
|
public PooledRefQueue<T> QueueItemsByType<T>(bool recurse = true, Predicate<T> predicate = null) where T : Item
|
||||||
|
{
|
||||||
|
var queue = PooledRefQueue<T>.Create();
|
||||||
|
foreach (var item in FindItemsByType(recurse, predicate))
|
||||||
|
{
|
||||||
|
queue.Enqueue(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
return queue;
|
||||||
|
}
|
||||||
|
|
||||||
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
|
public PooledRefList<Item> ListItemsByType(bool recurse = true, Predicate<Item> predicate = null) =>
|
||||||
|
ListItemsByType<Item>(recurse, predicate);
|
||||||
|
|
||||||
|
public PooledRefList<T> ListItemsByType<T>(bool recurse = true, Predicate<T> predicate = null) where T : Item
|
||||||
|
{
|
||||||
|
var list = PooledRefList<T>.Create();
|
||||||
|
foreach (var item in FindItemsByType(recurse, predicate))
|
||||||
|
{
|
||||||
|
list.Add(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ref struct FindItemsByTypeEnumerator<T> where T : Item
|
||||||
|
{
|
||||||
|
private PooledRefQueue<Container> _containers;
|
||||||
|
private Span<Item> _items;
|
||||||
|
private int _index;
|
||||||
|
private T _current;
|
||||||
|
private bool _recurse;
|
||||||
|
private Predicate<T> _predicate;
|
||||||
|
|
||||||
|
public FindItemsByTypeEnumerator(Container container, bool recurse, Predicate<T> predicate)
|
||||||
|
{
|
||||||
|
_containers = PooledRefQueue<Container>.Create();
|
||||||
|
|
||||||
|
if (container?.m_Items != null)
|
||||||
|
{
|
||||||
|
_items = CollectionsMarshal.AsSpan(container.m_Items);
|
||||||
|
}
|
||||||
|
|
||||||
|
_current = default;
|
||||||
|
_index = 0;
|
||||||
|
_recurse = recurse;
|
||||||
|
_predicate = predicate;
|
||||||
|
}
|
||||||
|
|
||||||
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
|
public bool MoveNext() => SetNextItem() || _recurse && SetNextContainer();
|
||||||
|
|
||||||
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
|
private bool SetNextContainer()
|
||||||
|
{
|
||||||
|
if (!_containers.TryDequeue(out var c))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
_items = CollectionsMarshal.AsSpan(c.m_Items);
|
||||||
|
_index = 0;
|
||||||
|
return SetNextItem();
|
||||||
|
}
|
||||||
|
|
||||||
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
|
private bool SetNextItem()
|
||||||
|
{
|
||||||
|
while (_index < _items.Length)
|
||||||
|
{
|
||||||
|
Item item = _items[_index++];
|
||||||
|
if (_recurse && item is Container { m_Items.Count: > 0 } c)
|
||||||
|
{
|
||||||
|
_containers.Enqueue(c);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (item is T t && _predicate?.Invoke(t) != false)
|
||||||
|
{
|
||||||
|
_current = t;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public T Current
|
||||||
|
{
|
||||||
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
|
get => _current;
|
||||||
|
}
|
||||||
|
|
||||||
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
|
public void Dispose() => _containers.Dispose();
|
||||||
|
|
||||||
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
|
public FindItemsByTypeEnumerator<T> GetEnumerator() => this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ref struct QueuedItemsEnumerator<T> where T : Item
|
||||||
|
{
|
||||||
|
private PooledRefQueue<T> _queue;
|
||||||
|
private T _current;
|
||||||
|
|
||||||
|
public QueuedItemsEnumerator(PooledRefQueue<T> queue)
|
||||||
|
{
|
||||||
|
_queue = queue;
|
||||||
|
_current = default;
|
||||||
|
}
|
||||||
|
|
||||||
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
|
public bool MoveNext()
|
||||||
|
{
|
||||||
|
if (_queue.TryDequeue(out var item))
|
||||||
|
{
|
||||||
|
_current = item;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public T Current
|
||||||
|
{
|
||||||
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
|
get => _current;
|
||||||
|
}
|
||||||
|
|
||||||
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
|
public void Dispose() => _queue.Dispose();
|
||||||
|
|
||||||
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
|
public QueuedItemsEnumerator<T> GetEnumerator() => this;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -14,10 +14,8 @@ public delegate int CheckItemGroup(Item a, Item b);
|
||||||
|
|
||||||
public delegate void ContainerSnoopHandler(Container cont, Mobile from);
|
public delegate void ContainerSnoopHandler(Container cont, Mobile from);
|
||||||
|
|
||||||
public class Container : Item
|
public partial class Container : Item
|
||||||
{
|
{
|
||||||
private static readonly List<Item> m_FindItemsList = new();
|
|
||||||
|
|
||||||
private ContainerData m_ContainerData;
|
private ContainerData m_ContainerData;
|
||||||
|
|
||||||
private int m_DropSound;
|
private int m_DropSound;
|
||||||
|
|
@ -817,19 +815,26 @@ public class Container : Item
|
||||||
throw new ArgumentNullException(nameof(grouper));
|
throw new ArgumentNullException(nameof(grouper));
|
||||||
}
|
}
|
||||||
|
|
||||||
var typedItems = CollectionsMarshal.AsSpan(FindItemsByType(type, recurse));
|
using var typedItems = PooledRefList<Item>.Create();
|
||||||
|
foreach (var item in FindItemsByType(recurse))
|
||||||
|
{
|
||||||
|
if (type.IsInstanceOfType(item))
|
||||||
|
{
|
||||||
|
typedItems.Add(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var groups = new List<List<Item>>();
|
var groups = new List<List<Item>>();
|
||||||
var idx = 0;
|
var idx = 0;
|
||||||
|
|
||||||
while (idx < typedItems.Length)
|
while (idx < typedItems.Count)
|
||||||
{
|
{
|
||||||
var a = typedItems[idx++];
|
var a = typedItems[idx++];
|
||||||
var group = new List<Item>();
|
var group = new List<Item>();
|
||||||
|
|
||||||
group.Add(a);
|
group.Add(a);
|
||||||
|
|
||||||
while (idx < typedItems.Length)
|
while (idx < typedItems.Count)
|
||||||
{
|
{
|
||||||
var b = typedItems[idx];
|
var b = typedItems[idx];
|
||||||
var v = grouper(a, b);
|
var v = grouper(a, b);
|
||||||
|
|
@ -929,19 +934,27 @@ public class Container : Item
|
||||||
|
|
||||||
for (var i = 0; i < types.Length; ++i)
|
for (var i = 0; i < types.Length; ++i)
|
||||||
{
|
{
|
||||||
var typedItems = CollectionsMarshal.AsSpan(FindItemsByType(types[i], recurse));
|
var type = types[i];
|
||||||
|
using var typedItems = PooledRefList<Item>.Create();
|
||||||
|
foreach (var item in FindItemsByType(recurse))
|
||||||
|
{
|
||||||
|
if (type.IsInstanceOfType(item))
|
||||||
|
{
|
||||||
|
typedItems.Add(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var groups = new List<List<Item>>();
|
var groups = new List<List<Item>>();
|
||||||
var idx = 0;
|
var idx = 0;
|
||||||
|
|
||||||
while (idx < typedItems.Length)
|
while (idx < typedItems.Count)
|
||||||
{
|
{
|
||||||
var a = typedItems[idx++];
|
var a = typedItems[idx++];
|
||||||
var group = new List<Item>();
|
var group = new List<Item>();
|
||||||
|
|
||||||
group.Add(a);
|
group.Add(a);
|
||||||
|
|
||||||
while (idx < typedItems.Length)
|
while (idx < typedItems.Count)
|
||||||
{
|
{
|
||||||
var b = typedItems[idx];
|
var b = typedItems[idx];
|
||||||
var v = grouper(a, b);
|
var v = grouper(a, b);
|
||||||
|
|
@ -1253,25 +1266,31 @@ public class Container : Item
|
||||||
|
|
||||||
public bool ConsumeTotal(Type type, int amount = 1, bool recurse = true, OnItemConsumed callback = null)
|
public bool ConsumeTotal(Type type, int amount = 1, bool recurse = true, OnItemConsumed callback = null)
|
||||||
{
|
{
|
||||||
var items = CollectionsMarshal.AsSpan(FindItemsByType(type, recurse));
|
var total = 0;
|
||||||
|
using var items = PooledRefQueue<Item>.Create();
|
||||||
|
|
||||||
// First pass, compute total
|
// First pass, compute total
|
||||||
var total = 0;
|
foreach (var item in FindItemsByType(recurse))
|
||||||
|
|
||||||
for (var i = 0; i < items.Length; ++i)
|
|
||||||
{
|
{
|
||||||
total += items[i].Amount;
|
if (type.IsInstanceOfType(item))
|
||||||
|
{
|
||||||
|
Items.Add(item);
|
||||||
|
total += item.Amount;
|
||||||
|
if (total >= amount)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// We have enough, so consume it
|
||||||
if (total >= amount)
|
if (total >= amount)
|
||||||
{
|
{
|
||||||
// We've enough, so consume it
|
|
||||||
|
|
||||||
var need = amount;
|
var need = amount;
|
||||||
|
|
||||||
for (var i = 0; i < items.Length; ++i)
|
while (items.Count > 0)
|
||||||
{
|
{
|
||||||
var item = items[i];
|
var item = items.Dequeue();
|
||||||
|
|
||||||
var theirAmount = item.Amount;
|
var theirAmount = item.Amount;
|
||||||
|
|
||||||
|
|
@ -1287,7 +1306,6 @@ public class Container : Item
|
||||||
callback?.Invoke(item, need);
|
callback?.Invoke(item, need);
|
||||||
|
|
||||||
item.Consume(need);
|
item.Consume(need);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1361,12 +1379,19 @@ public class Container : Item
|
||||||
|
|
||||||
var best = 0;
|
var best = 0;
|
||||||
|
|
||||||
var typedItems = CollectionsMarshal.AsSpan(FindItemsByType(type, recurse));
|
using var typedItems = PooledRefList<Item>.Create();
|
||||||
|
foreach (var item in FindItemsByType(recurse))
|
||||||
|
{
|
||||||
|
if (type.IsInstanceOfType(item))
|
||||||
|
{
|
||||||
|
typedItems.Add(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var groups = new List<List<Item>>();
|
var groups = new List<List<Item>>();
|
||||||
var idx = 0;
|
var idx = 0;
|
||||||
|
|
||||||
while (idx < typedItems.Length)
|
while (idx < typedItems.Count)
|
||||||
{
|
{
|
||||||
var a = typedItems[idx++];
|
var a = typedItems[idx++];
|
||||||
var group = new List<Item>
|
var group = new List<Item>
|
||||||
|
|
@ -1374,7 +1399,7 @@ public class Container : Item
|
||||||
a
|
a
|
||||||
};
|
};
|
||||||
|
|
||||||
while (idx < typedItems.Length)
|
while (idx < typedItems.Count)
|
||||||
{
|
{
|
||||||
var b = typedItems[idx];
|
var b = typedItems[idx];
|
||||||
var v = grouper(a, b);
|
var v = grouper(a, b);
|
||||||
|
|
@ -1540,9 +1565,12 @@ public class Container : Item
|
||||||
public int GetAmount(Type type, bool recurse = true)
|
public int GetAmount(Type type, bool recurse = true)
|
||||||
{
|
{
|
||||||
var total = 0;
|
var total = 0;
|
||||||
foreach (var item in FindItemsByType(type, recurse))
|
foreach (var item in FindItemsByType(recurse))
|
||||||
{
|
{
|
||||||
total += item.Amount;
|
if (type.IsInstanceOfType(item))
|
||||||
|
{
|
||||||
|
total += item.Amount;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return total;
|
return total;
|
||||||
|
|
@ -1551,9 +1579,12 @@ public class Container : Item
|
||||||
public int GetAmount(Type[] types, bool recurse = true)
|
public int GetAmount(Type[] types, bool recurse = true)
|
||||||
{
|
{
|
||||||
var total = 0;
|
var total = 0;
|
||||||
foreach (var item in FindItemsByType(types, recurse))
|
foreach (var item in FindItemsByType(recurse))
|
||||||
{
|
{
|
||||||
total += item.Amount;
|
if (InTypeList(item, types))
|
||||||
|
{
|
||||||
|
total += item.Amount;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return total;
|
return total;
|
||||||
|
|
@ -1561,23 +1592,12 @@ public class Container : Item
|
||||||
|
|
||||||
public List<Item> FindItemsByType(Type type, bool recurse = true)
|
public List<Item> FindItemsByType(Type type, bool recurse = true)
|
||||||
{
|
{
|
||||||
using var queue = PooledRefQueue<Container>.Create(128);
|
|
||||||
queue.Enqueue(this);
|
|
||||||
var items = new List<Item>();
|
var items = new List<Item>();
|
||||||
while (queue.Count > 0)
|
foreach (var item in FindItemsByType(recurse))
|
||||||
{
|
{
|
||||||
var container = queue.Dequeue();
|
if (type.IsInstanceOfType(item))
|
||||||
foreach (var item in container.Items)
|
|
||||||
{
|
{
|
||||||
if (type.IsInstanceOfType(item))
|
items.Add(item);
|
||||||
{
|
|
||||||
items.Add(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (recurse && item is Container itemContainer)
|
|
||||||
{
|
|
||||||
queue.Enqueue(itemContainer);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1586,23 +1606,12 @@ public class Container : Item
|
||||||
|
|
||||||
public List<Item> FindItemsByType(Type[] types, bool recurse = true)
|
public List<Item> FindItemsByType(Type[] types, bool recurse = true)
|
||||||
{
|
{
|
||||||
using var queue = PooledRefQueue<Container>.Create(128);
|
|
||||||
queue.Enqueue(this);
|
|
||||||
var items = new List<Item>();
|
var items = new List<Item>();
|
||||||
while (queue.Count > 0)
|
foreach (var item in FindItemsByType(recurse))
|
||||||
{
|
{
|
||||||
var container = queue.Dequeue();
|
if (InTypeList(item, types))
|
||||||
foreach (var item in container.Items)
|
|
||||||
{
|
{
|
||||||
if (InTypeList(item, types))
|
items.Add(item);
|
||||||
{
|
|
||||||
items.Add(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (recurse && item is Container itemContainer)
|
|
||||||
{
|
|
||||||
queue.Enqueue(itemContainer);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1611,22 +1620,11 @@ public class Container : Item
|
||||||
|
|
||||||
public Item FindItemByType(Type type, bool recurse = true)
|
public Item FindItemByType(Type type, bool recurse = true)
|
||||||
{
|
{
|
||||||
using var queue = PooledRefQueue<Container>.Create(128);
|
foreach (var item in FindItemsByType(recurse))
|
||||||
queue.Enqueue(this);
|
|
||||||
while (queue.Count > 0)
|
|
||||||
{
|
{
|
||||||
var container = queue.Dequeue();
|
if (type.IsInstanceOfType(item))
|
||||||
foreach (var item in container.Items)
|
|
||||||
{
|
{
|
||||||
if (type.IsInstanceOfType(item))
|
return item;
|
||||||
{
|
|
||||||
return item;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (recurse && item is Container itemContainer)
|
|
||||||
{
|
|
||||||
queue.Enqueue(itemContainer);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1635,73 +1633,17 @@ public class Container : Item
|
||||||
|
|
||||||
public Item FindItemByType(Type[] types, bool recurse = true)
|
public Item FindItemByType(Type[] types, bool recurse = true)
|
||||||
{
|
{
|
||||||
using var queue = PooledRefQueue<Container>.Create(128);
|
foreach (var item in FindItemsByType(recurse))
|
||||||
queue.Enqueue(this);
|
|
||||||
while (queue.Count > 0)
|
|
||||||
{
|
{
|
||||||
var container = queue.Dequeue();
|
if (InTypeList(item, types))
|
||||||
foreach (var item in container.Items)
|
|
||||||
{
|
{
|
||||||
if (InTypeList(item, types))
|
return item;
|
||||||
{
|
|
||||||
return item;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (recurse && item is Container itemContainer)
|
|
||||||
{
|
|
||||||
queue.Enqueue(itemContainer);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<T> FindItemsByType<T>(Predicate<T> predicate) where T : Item => FindItemsByType(true, predicate);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Performs a Breadth-First search through all the <see cref="Item" />s and
|
|
||||||
/// nested <see cref="Container" />s within this <see cref="Container" />.
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="T">Type of objects being searched for</typeparam>
|
|
||||||
/// <param name="recurse">
|
|
||||||
/// Optional: If true, the search will recursively
|
|
||||||
/// check any nested <see cref="Container" />s; otherwise, nested
|
|
||||||
/// <see cref="Container" />s will not be searched.
|
|
||||||
/// </param>
|
|
||||||
/// <param name="predicate">
|
|
||||||
/// Optional: A predicate to check if the <see cref="Item" />
|
|
||||||
/// of type <typeparamref name="T" /> is one of the targets of the search.
|
|
||||||
/// </param>
|
|
||||||
/// <returns>
|
|
||||||
/// A list of <see cref="Item" />s of type <typeparamref name="T" /> that matche the optional
|
|
||||||
/// <paramref name="predicate" />.
|
|
||||||
/// </returns>
|
|
||||||
public List<T> FindItemsByType<T>(bool recurse = true, Predicate<T> predicate = null) where T : Item
|
|
||||||
{
|
|
||||||
using var queue = PooledRefQueue<Container>.Create(128);
|
|
||||||
queue.Enqueue(this);
|
|
||||||
var items = new List<T>();
|
|
||||||
while (queue.Count > 0)
|
|
||||||
{
|
|
||||||
var container = queue.Dequeue();
|
|
||||||
foreach (var item in container.Items)
|
|
||||||
{
|
|
||||||
if (item is T typedItem && predicate?.Invoke(typedItem) != false)
|
|
||||||
{
|
|
||||||
items.Add(typedItem);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (recurse && item is Container itemContainer)
|
|
||||||
{
|
|
||||||
queue.Enqueue(itemContainer);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return items;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Performs a Breadth-First search through all the <see cref="Item" />s and
|
/// Performs a Breadth-First search through all the <see cref="Item" />s and
|
||||||
/// nested <see cref="Container" />s within this <see cref="Container" />.
|
/// nested <see cref="Container" />s within this <see cref="Container" />.
|
||||||
|
|
@ -1722,37 +1664,14 @@ public class Container : Item
|
||||||
/// </returns>
|
/// </returns>
|
||||||
public T FindItemByType<T>(bool recurse = true, Predicate<T> predicate = null) where T : Item
|
public T FindItemByType<T>(bool recurse = true, Predicate<T> predicate = null) where T : Item
|
||||||
{
|
{
|
||||||
using var queue = PooledRefQueue<Container>.Create(128);
|
foreach (var item in FindItemsByType(recurse, predicate))
|
||||||
queue.Enqueue(this);
|
|
||||||
while (queue.Count > 0)
|
|
||||||
{
|
{
|
||||||
var container = queue.Dequeue();
|
return item;
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private class GroupComparer : IComparer<Item>
|
|
||||||
{
|
|
||||||
private readonly CheckItemGroup m_Grouper;
|
|
||||||
|
|
||||||
public GroupComparer(CheckItemGroup grouper) => m_Grouper = grouper;
|
|
||||||
|
|
||||||
public int Compare(Item a, Item b) => m_Grouper(a, b);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Flags]
|
[Flags]
|
||||||
private enum SaveFlag : byte
|
private enum SaveFlag : byte
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -13,8 +13,6 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
|
|
||||||
using System;
|
|
||||||
|
|
||||||
namespace Server.Mobiles;
|
namespace Server.Mobiles;
|
||||||
|
|
||||||
public interface IMount : IHasSteps
|
public interface IMount : IHasSteps
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,7 @@ namespace Server.Commands.Generic
|
||||||
|
|
||||||
var list = new List<object>();
|
var list = new List<object>();
|
||||||
|
|
||||||
foreach (var item in cont.FindItemsByType<Item>())
|
foreach (var item in cont.FindItemsByType())
|
||||||
{
|
{
|
||||||
if (ext.IsValid(item))
|
if (ext.IsValid(item))
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1737,23 +1737,20 @@ namespace Server.Engines.ConPVP
|
||||||
|
|
||||||
var hadBomb = false;
|
var hadBomb = false;
|
||||||
|
|
||||||
corpse.FindItemsByType<BRBomb>(false)
|
foreach (var bomb in corpse.EnumerateItemsByType<BRBomb>(false))
|
||||||
.ForEach(
|
{
|
||||||
bomb =>
|
hadBomb = true;
|
||||||
{
|
bomb.DropTo(mob, killer);
|
||||||
hadBomb = true;
|
}
|
||||||
bomb.DropTo(mob, killer);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
mob.Backpack?.FindItemsByType<BRBomb>(false)
|
if (mob.Backpack != null)
|
||||||
.ForEach(
|
{
|
||||||
bomb =>
|
foreach (var bomb in mob.Backpack.EnumerateItemsByType<BRBomb>(false))
|
||||||
{
|
{
|
||||||
hadBomb = true;
|
hadBomb = true;
|
||||||
bomb.DropTo(mob, killer);
|
bomb.DropTo(mob, killer);
|
||||||
}
|
}
|
||||||
);
|
}
|
||||||
|
|
||||||
if (killer?.Player == true)
|
if (killer?.Player == true)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1018,23 +1018,20 @@ namespace Server.Engines.ConPVP
|
||||||
|
|
||||||
var hadFlag = false;
|
var hadFlag = false;
|
||||||
|
|
||||||
corpse.FindItemsByType<CTFFlag>(false)
|
foreach (var flag in corpse.EnumerateItemsByType<CTFFlag>(false))
|
||||||
.ForEach(
|
{
|
||||||
flag =>
|
hadFlag = true;
|
||||||
{
|
flag.DropTo(mob, killer);
|
||||||
hadFlag = true;
|
}
|
||||||
flag.DropTo(mob, killer);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
mob.Backpack?.FindItemsByType<CTFFlag>(false)
|
if (mob.Backpack != null)
|
||||||
.ForEach(
|
{
|
||||||
flag =>
|
foreach (var flag in mob.Backpack.EnumerateItemsByType<CTFFlag>(false))
|
||||||
{
|
{
|
||||||
hadFlag = true;
|
hadFlag = true;
|
||||||
flag.DropTo(mob, killer);
|
flag.DropTo(mob, killer);
|
||||||
}
|
}
|
||||||
);
|
}
|
||||||
|
|
||||||
if (killer?.Player == true)
|
if (killer?.Player == true)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -141,11 +141,12 @@ namespace Server.Engines.Craft
|
||||||
|
|
||||||
if (from.Backpack != null)
|
if (from.Backpack != null)
|
||||||
{
|
{
|
||||||
var items = from.Backpack.FindItemsByType(resourceType);
|
foreach (var item in from.Backpack.FindItemsByType())
|
||||||
|
|
||||||
for (var i = 0; i < items.Count; ++i)
|
|
||||||
{
|
{
|
||||||
resourceCount += items[i].Amount;
|
if (resourceType.IsInstanceOfType(item))
|
||||||
|
{
|
||||||
|
resourceCount += item.Amount;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -185,11 +186,12 @@ namespace Server.Engines.Craft
|
||||||
|
|
||||||
if (from.Backpack != null)
|
if (from.Backpack != null)
|
||||||
{
|
{
|
||||||
var items = from.Backpack.FindItemsByType(resourceType);
|
foreach (var item in from.Backpack.FindItemsByType())
|
||||||
|
|
||||||
for (var i = 0; i < items.Count; ++i)
|
|
||||||
{
|
{
|
||||||
resourceCount += items[i].Amount;
|
if (resourceType.IsInstanceOfType(item))
|
||||||
|
{
|
||||||
|
resourceCount += item.Amount;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -263,11 +265,13 @@ namespace Server.Engines.Craft
|
||||||
|
|
||||||
if (from.Backpack != null)
|
if (from.Backpack != null)
|
||||||
{
|
{
|
||||||
var items = from.Backpack.FindItemsByType(subResource.ItemType);
|
var type = subResource.ItemType;
|
||||||
|
foreach (var item in from.Backpack.FindItemsByType())
|
||||||
for (var j = 0; j < items.Count; ++j)
|
|
||||||
{
|
{
|
||||||
resourceCount += items[j].Amount;
|
if (type.IsInstanceOfType(item))
|
||||||
|
{
|
||||||
|
resourceCount += item.Amount;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -685,7 +685,14 @@ namespace Server.Engines.Craft
|
||||||
if (NameNumber == 1041267)
|
if (NameNumber == 1041267)
|
||||||
{
|
{
|
||||||
// Runebooks are a special case, they need a blank recall rune
|
// Runebooks are a special case, they need a blank recall rune
|
||||||
consumeExtra = ourPack.FindItemsByType<RecallRune>().Find(rune => !rune.Marked);
|
foreach (var rune in ourPack.FindItemsByType<RecallRune>())
|
||||||
|
{
|
||||||
|
if (!rune.Marked)
|
||||||
|
{
|
||||||
|
consumeExtra = rune;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (consumeExtra == null)
|
if (consumeExtra == null)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -385,7 +385,14 @@ namespace Server.Factions
|
||||||
|
|
||||||
// Ordinarily, through normal faction removal, this will never find any sigils.
|
// Ordinarily, through normal faction removal, this will never find any sigils.
|
||||||
// Only with a leave delay less than the ReturnPeriod or a Faction Kick/Ban, will this ever do anything
|
// Only with a leave delay less than the ReturnPeriod or a Faction Kick/Ban, will this ever do anything
|
||||||
mob.Backpack?.FindItemsByType<Sigil>().ForEach(sigil => sigil.ReturnHome());
|
|
||||||
|
if (mob.Backpack != null)
|
||||||
|
{
|
||||||
|
foreach (var sigil in mob.Backpack.EnumerateItemsByType<Sigil>())
|
||||||
|
{
|
||||||
|
sigil.ReturnHome();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (pl.RankIndex != -1)
|
if (pl.RankIndex != -1)
|
||||||
{
|
{
|
||||||
|
|
@ -1039,35 +1046,36 @@ namespace Server.Factions
|
||||||
|
|
||||||
var killerState = PlayerState.Find(killer);
|
var killerState = PlayerState.Find(killer);
|
||||||
var killerPack = killer?.Backpack;
|
var killerPack = killer?.Backpack;
|
||||||
victim.Backpack?.FindItemsByType<Sigil>()
|
|
||||||
.ForEach(
|
|
||||||
sigil =>
|
|
||||||
{
|
|
||||||
if (killerState == null || killerPack == null)
|
|
||||||
{
|
|
||||||
sigil.ReturnHome();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (killer?.GetDistanceToSqrt(victim) > 64)
|
if (victim.Backpack != null)
|
||||||
{
|
{
|
||||||
sigil.ReturnHome();
|
foreach (var sigil in victim.Backpack.EnumerateItemsByType<Sigil>())
|
||||||
killer.SendLocalizedMessage(1042230); // The sigil has gone back to its home location.
|
{
|
||||||
}
|
if (killerState == null || killerPack == null)
|
||||||
else if (Sigil.ExistsOn(killer))
|
{
|
||||||
{
|
sigil.ReturnHome();
|
||||||
sigil.ReturnHome();
|
continue;
|
||||||
// The sigil has gone back to its home location because you already have a sigil.
|
|
||||||
killer?.SendLocalizedMessage(1010258);
|
|
||||||
}
|
|
||||||
else if (!killerPack.TryDropItem(killer, sigil, false))
|
|
||||||
{
|
|
||||||
sigil.ReturnHome();
|
|
||||||
// The sigil has gone home because your backpack is full.
|
|
||||||
killer?.SendLocalizedMessage(1010259);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
);
|
|
||||||
|
if (killer?.GetDistanceToSqrt(victim) > 64)
|
||||||
|
{
|
||||||
|
sigil.ReturnHome();
|
||||||
|
killer.SendLocalizedMessage(1042230); // The sigil has gone back to its home location.
|
||||||
|
}
|
||||||
|
else if (Sigil.ExistsOn(killer))
|
||||||
|
{
|
||||||
|
sigil.ReturnHome();
|
||||||
|
// The sigil has gone back to its home location because you already have a sigil.
|
||||||
|
killer?.SendLocalizedMessage(1010258);
|
||||||
|
}
|
||||||
|
else if (!killerPack.TryDropItem(killer, sigil, false))
|
||||||
|
{
|
||||||
|
sigil.ReturnHome();
|
||||||
|
// The sigil has gone home because your backpack is full.
|
||||||
|
killer?.SendLocalizedMessage(1010259);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (killerState == null)
|
if (killerState == null)
|
||||||
{
|
{
|
||||||
|
|
@ -1227,7 +1235,13 @@ namespace Server.Factions
|
||||||
|
|
||||||
private static void EventSink_Logout(Mobile m)
|
private static void EventSink_Logout(Mobile m)
|
||||||
{
|
{
|
||||||
m.Backpack?.FindItemsByType<Sigil>().ForEach(sigil => sigil.ReturnHome());
|
if (m.Backpack != null)
|
||||||
|
{
|
||||||
|
foreach (var sigil in m.Backpack.EnumerateItemsByType<Sigil>())
|
||||||
|
{
|
||||||
|
sigil.ReturnHome();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void EventSink_Login(Mobile m) => CheckLeaveTimer(m);
|
private static void EventSink_Login(Mobile m) => CheckLeaveTimer(m);
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
using System;
|
using System;
|
||||||
using ModernUO.Serialization;
|
|
||||||
using Server.Factions.AI;
|
using Server.Factions.AI;
|
||||||
using Server.Items;
|
using Server.Items;
|
||||||
using Server.Mobiles;
|
using Server.Mobiles;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
|
||||||
using Server.Engines.Quests;
|
using Server.Engines.Quests;
|
||||||
using Server.Engines.Quests.Collector;
|
using Server.Engines.Quests.Collector;
|
||||||
using Server.Items;
|
using Server.Items;
|
||||||
|
|
@ -46,6 +45,27 @@ namespace Server.Engines.Harvest
|
||||||
0x34B5, 0x35D5
|
0x34B5, 0x35D5
|
||||||
};
|
};
|
||||||
|
|
||||||
|
private static readonly int[] bodyParts = {
|
||||||
|
0x1CDD, 0x1CE5, // arm
|
||||||
|
0x1CE0, 0x1CE8, // torso
|
||||||
|
0x1CE1, 0x1CE9, // head
|
||||||
|
0x1CE2, 0x1CEC // leg
|
||||||
|
};
|
||||||
|
|
||||||
|
private static readonly int[] boneParts = {
|
||||||
|
0x1AE0, 0x1AE1, 0x1AE2, 0x1AE3, 0x1AE4, // skulls
|
||||||
|
0x1B09, 0x1B0A, 0x1B0B, 0x1B0C, 0x1B0D, 0x1B0E, 0x1B0F, 0x1B10, // bone piles
|
||||||
|
0x1B15, 0x1B16 // pelvis bones
|
||||||
|
};
|
||||||
|
|
||||||
|
private static readonly int[] miscItems = {
|
||||||
|
0x1EB5, // unfinished barrel
|
||||||
|
0xA2A, // stool
|
||||||
|
0xC1F, // broken clock
|
||||||
|
0x1047, 0x1048, // globe
|
||||||
|
0x1EB1, 0x1EB2, 0x1EB3, 0x1EB4 // barrel staves
|
||||||
|
};
|
||||||
|
|
||||||
private Fishing()
|
private Fishing()
|
||||||
{
|
{
|
||||||
var fish = new HarvestDefinition
|
var fish = new HarvestDefinition
|
||||||
|
|
@ -101,7 +121,7 @@ namespace Server.Engines.Harvest
|
||||||
Definitions = new[] { fish };
|
Definitions = new[] { fish };
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Fishing System => _system ?? (_system = new Fishing());
|
public static Fishing System => _system ??= new Fishing();
|
||||||
|
|
||||||
public override void OnConcurrentHarvest(Mobile from, Item tool, HarvestDefinition def, object toHarvest)
|
public override void OnConcurrentHarvest(Mobile from, Item tool, HarvestDefinition def, object toHarvest)
|
||||||
{
|
{
|
||||||
|
|
@ -179,12 +199,8 @@ namespace Server.Engines.Harvest
|
||||||
|
|
||||||
if (pack != null)
|
if (pack != null)
|
||||||
{
|
{
|
||||||
List<SOS> messages = pack.FindItemsByType<SOS>();
|
foreach (var sos in pack.FindItemsByType<SOS>())
|
||||||
|
|
||||||
for (int i = 0; i < messages.Count; ++i)
|
|
||||||
{
|
{
|
||||||
SOS sos = messages[i];
|
|
||||||
|
|
||||||
if ((from.Map == Map.Felucca || from.Map == Map.Trammel) && from.InRange(sos.TargetLocation, 60))
|
if ((from.Map == Map.Felucca || from.Map == Map.Trammel) && from.InRange(sos.TargetLocation, 60))
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
|
|
@ -222,12 +238,9 @@ namespace Server.Engines.Harvest
|
||||||
|
|
||||||
if (pack != null)
|
if (pack != null)
|
||||||
{
|
{
|
||||||
var messages = pack.FindItemsByType<SOS>();
|
// We don't have to queue since we are returning on the first SOS.
|
||||||
|
foreach (var sos in pack.FindItemsByType<SOS>())
|
||||||
for (var i = 0; i < messages.Count; ++i)
|
|
||||||
{
|
{
|
||||||
var sos = messages[i];
|
|
||||||
|
|
||||||
if ((from.Map == Map.Felucca || from.Map == Map.Trammel) && from.InRange(sos.TargetLocation, 60))
|
if ((from.Map == Map.Felucca || from.Map == Map.Trammel) && from.InRange(sos.TargetLocation, 60))
|
||||||
{
|
{
|
||||||
Item preLoot = null;
|
Item preLoot = null;
|
||||||
|
|
@ -236,27 +249,12 @@ namespace Server.Engines.Harvest
|
||||||
{
|
{
|
||||||
case 0: // Body parts
|
case 0: // Body parts
|
||||||
{
|
{
|
||||||
int[] list =
|
preLoot = new ShipwreckedItem(bodyParts.RandomElement());
|
||||||
{
|
|
||||||
0x1CDD, 0x1CE5, // arm
|
|
||||||
0x1CE0, 0x1CE8, // torso
|
|
||||||
0x1CE1, 0x1CE9, // head
|
|
||||||
0x1CE2, 0x1CEC // leg
|
|
||||||
};
|
|
||||||
|
|
||||||
preLoot = new ShipwreckedItem(list.RandomElement());
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 1: // Bone parts
|
case 1: // Bone parts
|
||||||
{
|
{
|
||||||
int[] list =
|
preLoot = new ShipwreckedItem(boneParts.RandomElement());
|
||||||
{
|
|
||||||
0x1AE0, 0x1AE1, 0x1AE2, 0x1AE3, 0x1AE4, // skulls
|
|
||||||
0x1B09, 0x1B0A, 0x1B0B, 0x1B0C, 0x1B0D, 0x1B0E, 0x1B0F, 0x1B10, // bone piles
|
|
||||||
0x1B15, 0x1B16 // pelvis bones
|
|
||||||
};
|
|
||||||
|
|
||||||
preLoot = new ShipwreckedItem(list.RandomElement());
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 2: // Paintings and portraits
|
case 2: // Paintings and portraits
|
||||||
|
|
@ -276,36 +274,16 @@ namespace Server.Engines.Harvest
|
||||||
}
|
}
|
||||||
case 5: // Hats
|
case 5: // Hats
|
||||||
{
|
{
|
||||||
if (Utility.RandomBool())
|
preLoot = Utility.RandomBool() ? new SkullCap() : new TricorneHat();
|
||||||
{
|
|
||||||
preLoot = new SkullCap();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
preLoot = new TricorneHat();
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 6: // Misc
|
case 6: // Misc
|
||||||
{
|
{
|
||||||
int[] list =
|
var rand = Utility.Random(miscItems.Length + 1);
|
||||||
{
|
|
||||||
0x1EB5, // unfinished barrel
|
|
||||||
0xA2A, // stool
|
|
||||||
0xC1F, // broken clock
|
|
||||||
0x1047, 0x1048, // globe
|
|
||||||
0x1EB1, 0x1EB2, 0x1EB3, 0x1EB4 // barrel staves
|
|
||||||
};
|
|
||||||
|
|
||||||
if (Utility.Random(list.Length + 1) == 0)
|
preLoot = rand == miscItems.Length
|
||||||
{
|
? new Candelabra()
|
||||||
preLoot = new Candelabra();
|
: new ShipwreckedItem(miscItems[rand]);
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
preLoot = new ShipwreckedItem(list.RandomElement());
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -317,16 +295,7 @@ namespace Server.Engines.Harvest
|
||||||
return preLoot;
|
return preLoot;
|
||||||
}
|
}
|
||||||
|
|
||||||
LockableContainer chest;
|
LockableContainer chest = Utility.RandomBool() ? new MetalGoldenChest() : new WoodenChest();
|
||||||
|
|
||||||
if (Utility.RandomBool())
|
|
||||||
{
|
|
||||||
chest = new MetalGoldenChest();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
chest = new WoodenChest();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (sos.IsAncient)
|
if (sos.IsAncient)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Linq;
|
|
||||||
using Server.Gumps;
|
using Server.Gumps;
|
||||||
|
|
||||||
namespace Server.Engines.MLQuests.Objectives
|
namespace Server.Engines.MLQuests.Objectives
|
||||||
|
|
@ -110,8 +109,16 @@ namespace Server.Engines.MLQuests.Objectives
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
var items = pack.FindItemsByType(Objective.AcceptedType, false); // Note: subclasses are included
|
var total = 0;
|
||||||
return items.Where(item => item.QuestItem && Objective.CheckItem(item)).Sum(item => item.Amount);
|
foreach (var item in pack.FindItemsByType(false))
|
||||||
|
{
|
||||||
|
if (ClaimTypePredicate(item) && item.QuestItem && Objective.CheckItem(item))
|
||||||
|
{
|
||||||
|
total += item.Amount;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return total;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override bool AllowsQuestItem(Item item, Type type) => Objective.CheckType(type) && Objective.CheckItem(item);
|
public override bool AllowsQuestItem(Item item, Type type) => Objective.CheckType(type) && Objective.CheckItem(item);
|
||||||
|
|
@ -128,19 +135,20 @@ namespace Server.Engines.MLQuests.Objectives
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var checkType = Objective.AcceptedType;
|
foreach (var item in pack.FindItemsByType(false))
|
||||||
var items = pack.FindItemsByType(checkType, false);
|
|
||||||
|
|
||||||
foreach (var item in items)
|
|
||||||
{
|
{
|
||||||
if (item.QuestItem && !MLQuestSystem.CanMarkQuestItem(pm, item, checkType)
|
// does another quest still need this item? (OSI just unmarks everything)
|
||||||
) // does another quest still need this item? (OSI just unmarks everything)
|
if (ClaimTypePredicate(item) &&
|
||||||
|
item.QuestItem && !MLQuestSystem.CanMarkQuestItem(pm, item, Objective.AcceptedType))
|
||||||
{
|
{
|
||||||
item.QuestItem = false;
|
item.QuestItem = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Note: subclasses are included
|
||||||
|
private bool ClaimTypePredicate(Item item) => Objective.AcceptedType.IsInstanceOfType(item);
|
||||||
|
|
||||||
// Should only be called after IsComplete() is checked to be true
|
// Should only be called after IsComplete() is checked to be true
|
||||||
public override void OnClaimReward()
|
public override void OnClaimReward()
|
||||||
{
|
{
|
||||||
|
|
@ -153,10 +161,9 @@ namespace Server.Engines.MLQuests.Objectives
|
||||||
|
|
||||||
// TODO: OSI also counts the item in the cursor?
|
// TODO: OSI also counts the item in the cursor?
|
||||||
|
|
||||||
var items = pack.FindItemsByType(Objective.AcceptedType, false);
|
|
||||||
var left = Objective.DesiredAmount;
|
var left = Objective.DesiredAmount;
|
||||||
|
|
||||||
foreach (var item in items)
|
foreach (var item in pack.EnumerateItemsByType<Item>(false, ClaimTypePredicate))
|
||||||
{
|
{
|
||||||
if (item.QuestItem && Objective.CheckItem(item))
|
if (item.QuestItem && Objective.CheckItem(item))
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
|
||||||
using Server.Gumps;
|
using Server.Gumps;
|
||||||
using Server.Items;
|
using Server.Items;
|
||||||
using Server.Logging;
|
using Server.Logging;
|
||||||
|
|
@ -150,8 +149,16 @@ namespace Server.Engines.MLQuests.Objectives
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
var items = pack.FindItemsByType(Objective.Delivery, false); // Note: subclasses are included
|
var total = 0;
|
||||||
return items.Sum(item => item.Amount);
|
foreach (var item in pack.FindItemsByType(false))
|
||||||
|
{
|
||||||
|
if (ClaimTypePredicate(item))
|
||||||
|
{
|
||||||
|
total += item.Amount;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return total;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override bool OnBeforeClaimReward()
|
public override bool OnBeforeClaimReward()
|
||||||
|
|
@ -171,6 +178,9 @@ namespace Server.Engines.MLQuests.Objectives
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Note: subclasses are included
|
||||||
|
private bool ClaimTypePredicate(Item item) => Objective.Delivery.IsInstanceOfType(item);
|
||||||
|
|
||||||
// TODO: This is VERY similar to CollectObjective.OnClaimReward
|
// TODO: This is VERY similar to CollectObjective.OnClaimReward
|
||||||
public override void OnClaimReward()
|
public override void OnClaimReward()
|
||||||
{
|
{
|
||||||
|
|
@ -181,10 +191,9 @@ namespace Server.Engines.MLQuests.Objectives
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var items = pack.FindItemsByType(Objective.Delivery, false);
|
|
||||||
var left = Objective.Amount;
|
var left = Objective.Amount;
|
||||||
|
|
||||||
foreach (var item in items)
|
foreach (var item in pack.EnumerateItemsByType<Item>(false, ClaimTypePredicate))
|
||||||
{
|
{
|
||||||
if (left == 0)
|
if (left == 0)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -327,11 +327,16 @@ namespace Server.Engines.Plants
|
||||||
}
|
}
|
||||||
case 6: // Water
|
case 6: // Water
|
||||||
{
|
{
|
||||||
var bev = from.Backpack.FindItemsByType<BaseBeverage>()
|
BaseBeverage bev = null;
|
||||||
.Find(
|
|
||||||
beverage =>
|
foreach (var beverage in from.Backpack.FindItemsByType<BaseBeverage>())
|
||||||
beverage.IsEmpty && beverage.Pourable && beverage.Content == BeverageType.Water
|
{
|
||||||
);
|
if (beverage.IsEmpty && beverage.Pourable && beverage.Content == BeverageType.Water)
|
||||||
|
{
|
||||||
|
bev = beverage;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (bev == null)
|
if (bev == null)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
using System;
|
using System;
|
||||||
using ModernUO.Serialization;
|
using ModernUO.Serialization;
|
||||||
|
using Server.Items;
|
||||||
using Server.Misc;
|
using Server.Misc;
|
||||||
|
|
||||||
namespace Server.Engines.Plants
|
namespace Server.Engines.Plants
|
||||||
|
|
@ -402,28 +403,29 @@ namespace Server.Engines.Plants
|
||||||
|
|
||||||
private static void EventSink_Login(Mobile from)
|
private static void EventSink_Login(Mobile from)
|
||||||
{
|
{
|
||||||
from.Backpack?.FindItemsByType<PlantItem>()
|
Container cont = from.Backpack;
|
||||||
.ForEach(
|
if (cont != null)
|
||||||
plant =>
|
{
|
||||||
|
foreach (var plant in cont.FindItemsByType<PlantItem>())
|
||||||
|
{
|
||||||
|
if (plant.IsGrowable)
|
||||||
{
|
{
|
||||||
if (plant.IsGrowable)
|
plant.PlantSystem.DoGrowthCheck();
|
||||||
{
|
|
||||||
plant.PlantSystem.DoGrowthCheck();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
);
|
}
|
||||||
|
}
|
||||||
|
|
||||||
from.FindBankNoCreate()
|
cont = from.FindBankNoCreate();
|
||||||
?.FindItemsByType<PlantItem>()
|
if (cont != null)
|
||||||
.ForEach(
|
{
|
||||||
plant =>
|
foreach (var plant in cont.FindItemsByType<PlantItem>())
|
||||||
|
{
|
||||||
|
if (plant.IsGrowable)
|
||||||
{
|
{
|
||||||
if (plant.IsGrowable)
|
plant.PlantSystem.DoGrowthCheck();
|
||||||
{
|
|
||||||
plant.PlantSystem.DoGrowthCheck();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
);
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void GrowAll()
|
public static void GrowAll()
|
||||||
|
|
|
||||||
|
|
@ -921,7 +921,20 @@ namespace Server.Items
|
||||||
|
|
||||||
public static FishBowl GetEmptyBowl(Mobile from)
|
public static FishBowl GetEmptyBowl(Mobile from)
|
||||||
{
|
{
|
||||||
return from?.Backpack?.FindItemsByType<FishBowl>().Find(bowl => bowl.Empty);
|
if (from.Backpack == null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var bowl in from.Backpack.FindItemsByType<FishBowl>())
|
||||||
|
{
|
||||||
|
if (bowl.Empty)
|
||||||
|
{
|
||||||
|
return bowl;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool Accepts(Item item)
|
public static bool Accepts(Item item)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
|
||||||
using ModernUO.Serialization;
|
using ModernUO.Serialization;
|
||||||
using Server.ContextMenus;
|
using Server.ContextMenus;
|
||||||
using Server.Engines.Craft;
|
using Server.Engines.Craft;
|
||||||
|
|
@ -173,7 +172,20 @@ public partial class SalvageBag : Bag
|
||||||
|
|
||||||
private void SalvageIngots(Mobile from)
|
private void SalvageIngots(Mobile from)
|
||||||
{
|
{
|
||||||
if (from.Backpack.FindItemsByType<BaseTool>().All(tool => tool.CraftSystem != DefBlacksmithy.CraftSystem))
|
var hasTool = false;
|
||||||
|
if (from.Backpack != null)
|
||||||
|
{
|
||||||
|
foreach (var tool in from.Backpack.FindItemsByType<BaseTool>())
|
||||||
|
{
|
||||||
|
if (tool.CraftSystem == DefBlacksmithy.CraftSystem)
|
||||||
|
{
|
||||||
|
hasTool = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!hasTool)
|
||||||
{
|
{
|
||||||
from.SendLocalizedMessage(1079822); // You need a blacksmithing tool in order to salvage ingots.
|
from.SendLocalizedMessage(1079822); // You need a blacksmithing tool in order to salvage ingots.
|
||||||
return;
|
return;
|
||||||
|
|
@ -190,11 +202,7 @@ public partial class SalvageBag : Bag
|
||||||
var salvaged = 0;
|
var salvaged = 0;
|
||||||
var notSalvaged = 0;
|
var notSalvaged = 0;
|
||||||
|
|
||||||
Container sBag = this;
|
foreach (var item in FindItemsByType())
|
||||||
|
|
||||||
var smeltables = sBag.FindItemsByType<Item>();
|
|
||||||
|
|
||||||
foreach (var item in smeltables)
|
|
||||||
{
|
{
|
||||||
if (item?.Deleted != false)
|
if (item?.Deleted != false)
|
||||||
{
|
{
|
||||||
|
|
@ -220,10 +228,8 @@ public partial class SalvageBag : Bag
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
from.SendLocalizedMessage(
|
// Salvaged: ~1_COUNT~/~2_NUM~ blacksmithed items
|
||||||
1079973,
|
from.SendLocalizedMessage(1079973, $"{salvaged}\t{salvaged + notSalvaged}");
|
||||||
$"{salvaged}\t{salvaged + notSalvaged}"
|
|
||||||
); // Salvaged: ~1_COUNT~/~2_NUM~ blacksmithed items
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -245,14 +251,8 @@ public partial class SalvageBag : Bag
|
||||||
var salvaged = 0;
|
var salvaged = 0;
|
||||||
var notSalvaged = 0;
|
var notSalvaged = 0;
|
||||||
|
|
||||||
Container sBag = this;
|
foreach (var item in EnumerateItemsByType<Item>())
|
||||||
|
|
||||||
var scissorables = sBag.FindItemsByType<Item>();
|
|
||||||
|
|
||||||
for (var i = scissorables.Count - 1; i >= 0; --i)
|
|
||||||
{
|
{
|
||||||
var item = scissorables[i];
|
|
||||||
|
|
||||||
if (item is not IScissorable scissorable)
|
if (item is not IScissorable scissorable)
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using ModernUO.Serialization;
|
using ModernUO.Serialization;
|
||||||
|
using Server.Collections;
|
||||||
using Server.Engines.Plants;
|
using Server.Engines.Plants;
|
||||||
using Server.Engines.Quests;
|
using Server.Engines.Quests;
|
||||||
using Server.Engines.Quests.Hag;
|
using Server.Engines.Quests.Hag;
|
||||||
|
|
@ -662,15 +663,15 @@ public abstract partial class BaseBeverage : Item, IHasQuantity
|
||||||
|
|
||||||
public static bool ConsumeTotal(Container pack, Type itemType, BeverageType content, int quantity)
|
public static bool ConsumeTotal(Container pack, Type itemType, BeverageType content, int quantity)
|
||||||
{
|
{
|
||||||
var items = pack.FindItemsByType(itemType);
|
var total = 0;
|
||||||
|
using var queue = PooledRefQueue<BaseBeverage>.Create();
|
||||||
|
|
||||||
// First pass, compute total
|
// First pass, compute total
|
||||||
var total = 0;
|
foreach (var bev in pack.FindItemsByType<BaseBeverage>())
|
||||||
|
|
||||||
for (var i = 0; i < items.Count; ++i)
|
|
||||||
{
|
{
|
||||||
if (items[i] is BaseBeverage bev && bev.Content == content && !bev.IsEmpty)
|
if (itemType.IsInstanceOfType(bev) && bev.Content == content && !bev.IsEmpty)
|
||||||
{
|
{
|
||||||
|
queue.Enqueue(bev);
|
||||||
total += bev.Quantity;
|
total += bev.Quantity;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -681,12 +682,9 @@ public abstract partial class BaseBeverage : Item, IHasQuantity
|
||||||
|
|
||||||
var need = quantity;
|
var need = quantity;
|
||||||
|
|
||||||
for (var i = 0; i < items.Count; ++i)
|
while (queue.Count > 0)
|
||||||
{
|
{
|
||||||
if (items[i] is not BaseBeverage bev || bev.Content != content || bev.IsEmpty)
|
var bev = queue.Dequeue();
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
var theirQuantity = bev.Quantity;
|
var theirQuantity = bev.Quantity;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -83,12 +83,8 @@ public abstract partial class BasePotion : Item, ICraftable, ICommodity
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
var kegs = pack.FindItemsByType<PotionKeg>();
|
foreach (var keg in pack.EnumerateItemsByType<PotionKeg>())
|
||||||
|
|
||||||
for (var i = 0; i < kegs.Count; ++i)
|
|
||||||
{
|
{
|
||||||
var keg = kegs[i];
|
|
||||||
|
|
||||||
if (keg.Held is <= 0 or >= 100)
|
if (keg.Held is <= 0 or >= 100)
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
|
|
|
||||||
|
|
@ -2393,9 +2393,14 @@ namespace Server.Mobiles
|
||||||
|
|
||||||
DropHolding();
|
DropHolding();
|
||||||
|
|
||||||
|
// During AOS+, insured/blessed items are moved out of their child containers and put directly into the backpack.
|
||||||
|
// This fixes a "bug" where players put blessed items in nested bags and they were dropped on death
|
||||||
if (Core.AOS && Backpack?.Deleted == false)
|
if (Core.AOS && Backpack?.Deleted == false)
|
||||||
{
|
{
|
||||||
Backpack.FindItemsByType<Item>(FindItems_Callback).ForEach(item => Backpack.AddItem(item));
|
foreach (var item in Backpack.EnumerateItemsByType<Item>(predicate: FindItems_Callback))
|
||||||
|
{
|
||||||
|
Backpack.AddItem(item);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
EquipSnapshot = new List<Item>(Items);
|
EquipSnapshot = new List<Item>(Items);
|
||||||
|
|
@ -3910,13 +3915,13 @@ namespace Server.Mobiles
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var items = new List<Item>();
|
using var queue = PooledRefQueue<Item>.Create(128);
|
||||||
|
|
||||||
foreach (var item in Items)
|
foreach (var item in Items)
|
||||||
{
|
{
|
||||||
if (DisplayInItemInsuranceGump(item))
|
if (DisplayInItemInsuranceGump(item))
|
||||||
{
|
{
|
||||||
items.Add(item);
|
queue.Enqueue(item);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -3924,20 +3929,26 @@ namespace Server.Mobiles
|
||||||
|
|
||||||
if (pack != null)
|
if (pack != null)
|
||||||
{
|
{
|
||||||
items.AddRange(pack.FindItemsByType<Item>(DisplayInItemInsuranceGump));
|
foreach (var item in pack.FindItemsByType())
|
||||||
|
{
|
||||||
|
if (DisplayInItemInsuranceGump(item))
|
||||||
|
{
|
||||||
|
queue.Enqueue(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Investigate item sorting
|
// TODO: Investigate item sorting
|
||||||
|
|
||||||
CloseGump<ItemInsuranceMenuGump>();
|
CloseGump<ItemInsuranceMenuGump>();
|
||||||
|
|
||||||
if (items.Count == 0)
|
if (queue.Count == 0)
|
||||||
{
|
{
|
||||||
SendLocalizedMessage(1114915, "", 0x35); // None of your current items meet the requirements for insurance.
|
SendLocalizedMessage(1114915, "", 0x35); // None of your current items meet the requirements for insurance.
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
SendGump(new ItemInsuranceMenuGump(this, items.ToArray()));
|
SendGump(new ItemInsuranceMenuGump(this, queue.ToArray()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
|
||||||
using Server.Accounting;
|
using Server.Accounting;
|
||||||
using Server.ContextMenus;
|
using Server.ContextMenus;
|
||||||
using Server.Items;
|
using Server.Items;
|
||||||
|
|
@ -47,32 +46,36 @@ namespace Server.Mobiles
|
||||||
|
|
||||||
if (bank != null)
|
if (bank != null)
|
||||||
{
|
{
|
||||||
var gold = bank.FindItemsByType<Gold>();
|
foreach (var gold in bank.FindItemsByType<Gold>())
|
||||||
var checks = bank.FindItemsByType<BankCheck>();
|
{
|
||||||
|
balance += gold.Amount;
|
||||||
|
}
|
||||||
|
|
||||||
balance += gold.Aggregate(0L, (c, t) => c + t.Amount);
|
|
||||||
if (balance >= int.MaxValue)
|
if (balance >= int.MaxValue)
|
||||||
{
|
{
|
||||||
return int.MaxValue;
|
return int.MaxValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
balance += checks.Aggregate(0L, (c, t) => c + t.Worth);
|
foreach (var check in bank.FindItemsByType<BankCheck>())
|
||||||
|
{
|
||||||
|
balance += check.Worth;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return Math.Max(0, (int)Math.Min(int.MaxValue, balance));
|
return (int)Math.Clamp(balance, 0, int.MaxValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int GetBalance(Mobile m, out List<Item> gold, out List<Item> checks)
|
public static int GetBalance(Mobile m, out List<Item> gold, out List<Item> checks)
|
||||||
{
|
{
|
||||||
long balance = 0;
|
long balance = 0;
|
||||||
|
gold = checks = new List<Item>();
|
||||||
|
|
||||||
if (AccountGold.Enabled && m.Account != null)
|
if (AccountGold.Enabled && m.Account != null)
|
||||||
{
|
{
|
||||||
balance = m.Account.GetTotalGold();
|
balance = m.Account.GetTotalGold();
|
||||||
|
|
||||||
if (balance > int.MaxValue)
|
if (balance >= int.MaxValue)
|
||||||
{
|
{
|
||||||
gold = checks = new List<Item>();
|
|
||||||
return int.MaxValue;
|
return int.MaxValue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -81,23 +84,25 @@ namespace Server.Mobiles
|
||||||
|
|
||||||
if (bank != null)
|
if (bank != null)
|
||||||
{
|
{
|
||||||
gold = bank.FindItemsByType(typeof(Gold));
|
foreach (var g in bank.FindItemsByType<Gold>())
|
||||||
checks = bank.FindItemsByType(typeof(BankCheck));
|
{
|
||||||
|
balance += g.Amount;
|
||||||
|
gold.Add(g);
|
||||||
|
}
|
||||||
|
|
||||||
balance += gold.OfType<Gold>().Aggregate(0L, (c, t) => c + t.Amount);
|
|
||||||
if (balance >= int.MaxValue)
|
if (balance >= int.MaxValue)
|
||||||
{
|
{
|
||||||
return int.MaxValue;
|
return int.MaxValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
balance += checks.OfType<BankCheck>().Aggregate(0L, (c, t) => c + t.Worth);
|
foreach (var bc in bank.FindItemsByType<BankCheck>())
|
||||||
}
|
{
|
||||||
else
|
balance += bc.Worth;
|
||||||
{
|
checks.Add(bc);
|
||||||
gold = checks = new List<Item>();
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return Math.Max(0, (int)Math.Min(int.MaxValue, balance));
|
return (int)Math.Clamp(balance, 0, int.MaxValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool Withdraw(Mobile from, int amount)
|
public static bool Withdraw(Mobile from, int amount)
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@ using Server.Factions;
|
||||||
using Server.Items;
|
using Server.Items;
|
||||||
using Server.Misc;
|
using Server.Misc;
|
||||||
using Server.Mobiles;
|
using Server.Mobiles;
|
||||||
using Server.Multis;
|
|
||||||
|
|
||||||
namespace Server.Spells.Seventh
|
namespace Server.Spells.Seventh
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue