ecbee17690
## Breaking Changes (New API)
ObjectPropertyList supports the following API:
```cs
list.Add(500000);
list.Add(500001, stringArgument);
list.Add("Some text");
list.Add($"Some text with {argument}");
list.Add(500002, $"{arg1}\t{arg2}");
```
## Notes
1. All API uses that require a formatter like this:
```cs
list.Add(500002, "{0}\t{1}", arg1, arg2);
```
Should be changed to use string interpolation, for example:
```cs
list.Add(500002, $"{arg1}\t{arg2}");
```
2. The following paradigm should no longer be used:
```cs
list.Add(1061170, prop.ToString()); // strength requirement ~1_val~
```
The new string interpolation API will avoid having to convert the argument to a string before writing it to the packet. Instead use the following:
```cs
list.Add(1061170, $"{prop}"); // strength requirement ~1_val~
```
### Benchmarks
```cs
| Method | Mean | Error | StdDev | Gen 0 | Allocated |
|------------------------------- |---------:|--------:|--------:|-------:|----------:|
| BenchmarkOldOPL | 241.0 ns | 0.56 ns | 0.47 ns | 0.0105 | 88 B |
| BenchmarkStringInterpolatedOPL | 199.9 ns | 2.44 ns | 2.39 ns | - | - |
```
### Changes
- [X] Removes crash in STArray.Return when array is null.
- [X] Fixes NPE in OPL when entity is null. Serial in packet will be 0 when entity is null.
- [X] Fixes NPE in AosAttributes when Parent is null.
- [X] Changes OPL to use string interpolation.
- [X] Introduces `IPropertyList` to allow extending PropertyList for other uses.
116 lines
3.5 KiB
C#
116 lines
3.5 KiB
C#
using ModernUO.Serialization;
|
|
|
|
namespace Server.Items
|
|
{
|
|
[SerializationGenerator(0, false)]
|
|
public partial class AquariumFishNet : SpecialFishingNet
|
|
{
|
|
[Constructible]
|
|
public AquariumFishNet()
|
|
{
|
|
ItemID = 0xDC8;
|
|
}
|
|
|
|
public override int LabelNumber => 1074463; // An aquarium fishing net
|
|
|
|
public override bool RequireDeepWater => false;
|
|
|
|
protected override void AddNetProperties(IPropertyList list)
|
|
{
|
|
}
|
|
|
|
protected override void FinishEffect(Point3D p, Map map, Mobile from)
|
|
{
|
|
if (from.Skills.Fishing.Value < 10)
|
|
{
|
|
from.SendLocalizedMessage(1074487); // The creatures are too quick for you!
|
|
}
|
|
else
|
|
{
|
|
var fish = GiveFish(from);
|
|
var bowl = Aquarium.GetEmptyBowl(from);
|
|
|
|
if (bowl != null)
|
|
{
|
|
fish.StopTimer();
|
|
bowl.AddItem(fish);
|
|
from.SendLocalizedMessage(1074489); // A live creature jumps into the fish bowl in your pack!
|
|
Delete();
|
|
return;
|
|
}
|
|
|
|
if (from.PlaceInBackpack(fish))
|
|
{
|
|
from.PlaySound(0x5A2);
|
|
from.SendLocalizedMessage(
|
|
1074490
|
|
); // A live creature flops around in your pack before running out of air.
|
|
|
|
fish.Kill();
|
|
Delete();
|
|
return;
|
|
}
|
|
|
|
fish.Delete();
|
|
|
|
from.SendLocalizedMessage(1074488); // You could not hold the creature.
|
|
}
|
|
|
|
InUse = false;
|
|
Movable = true;
|
|
|
|
if (!from.PlaceInBackpack(this))
|
|
{
|
|
if (from.Map == null || from.Map == Map.Internal)
|
|
{
|
|
Delete();
|
|
}
|
|
else
|
|
{
|
|
MoveToWorld(from.Location, from.Map);
|
|
}
|
|
}
|
|
}
|
|
|
|
private BaseFish GiveFish(Mobile from)
|
|
{
|
|
var skill = from.Skills.Fishing.Value;
|
|
|
|
if (skill / 100.0 >= Utility.RandomDouble())
|
|
{
|
|
var max = (int)skill / 5;
|
|
|
|
if (max > 20)
|
|
{
|
|
max = 20;
|
|
}
|
|
|
|
return Utility.Random(max) switch
|
|
{
|
|
0 => new MinocBlueFish(),
|
|
1 => new Shrimp(),
|
|
2 => new FandancerFish(),
|
|
3 => new GoldenBroadtail(),
|
|
4 => new RedDartFish(),
|
|
5 => new AlbinoCourtesanFish(),
|
|
6 => new MakotoCourtesanFish(),
|
|
7 => new NujelmHoneyFish(),
|
|
8 => new Jellyfish(),
|
|
9 => new SpeckledCrab(),
|
|
10 => new LongClawCrab(),
|
|
11 => new AlbinoFrog(),
|
|
12 => new KillerFrog(),
|
|
13 => new VesperReefTiger(),
|
|
14 => new PurpleFrog(),
|
|
15 => new BritainCrownFish(),
|
|
16 => new YellowFinBluebelly(),
|
|
17 => new SpottedBuccaneer(),
|
|
18 => new SpinedScratcherFish(),
|
|
_ => new SmallMouthSuckerFin()
|
|
};
|
|
}
|
|
|
|
return new MinocBlueFish();
|
|
}
|
|
}
|
|
}
|