fix: Fixes localization corner cases with OPL (#1050)

## Changes
- [X] Adds OPL convenience methods
    - `opl.Add(cliloc, value)` and `opl.Add(value)` - value as an integer or string works just like `opl.Add(cliloc, $"{value}")`
    - `opl.AddLocalized(cliloc, clilocValue)` - works the same as `opl.Add(cliloc, $"#{clilocValue}");`
- [X] Simplifies basic `list.Add()` situations
- [X] Changes cliloc as an argument so it works with custom IPropertyList implementations (HTML)
- [X] Fixes plants so they support the old localization and new (changed in 7.0.12.0+)
- [X] Exposes more methods to override for Item to make creating custom OPL possible.

## Important Notes
* Using a ternary as an argument, like this `opl.Add(number, showType ? $"{type}\t{value}" : $"{value}");` _will not use the correct string interpolation_. This means if you use a custom PropertyList (for HTML or some other purpose), the property list won't be localized properly.
* All localization values must be interpolated, even if they are literal strings, or integers. Example: `opl.Add(number, $"{"Charges"}\t{m_Charges}");` is correct. Using the following: `$"Charges\t{m_Charges}"` will not work for custom PropertyList implementations!
This commit is contained in:
Kamron Batman 2022-06-12 21:17:42 -07:00 • committed by GitHub
parent 12404ba6f6
commit b74b47159f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
75 changed files with 715 additions and 477 deletions

View file

@ -1,5 +1,6 @@
using ModernUO.Serialization;
using Server.Targeting;
using Server.Text;
namespace Server.Items;
@ -66,13 +67,20 @@ public partial class CommodityDeed : Item
{
base.GetProperties(list);
if (Commodity != null)
if (Commodity is ICommodity ic)
{
var args = Commodity.Name == null
? $"#{(Commodity as ICommodity)?.DescriptionNumber ?? Commodity.LabelNumber}\t{Commodity.Amount}"
: $"{Commodity.Name}\t{Commodity.Amount}";
list.Add(1060658, args); // ~1_val~: ~2_val~
list.Add(1060658, $"{ic.DescriptionNumber:#}\t{Commodity.Amount}"); // ~1_val~: ~2_val~
}
else if (Commodity != null)
{
if (Commodity.Name == null)
{
list.Add(1060658, $"{Commodity.LabelNumber:#}\t{Commodity.Amount}"); // ~1_val~: ~2_val~
}
else
{
list.Add(1060658, $"{Commodity.Name}\t{Commodity.Amount}"); // ~1_val~: ~2_val~
}
}
else
{
@ -86,11 +94,13 @@ public partial class CommodityDeed : Item
if (Commodity != null)
{
var args = Commodity.Name == null
? $"#{(Commodity as ICommodity)?.DescriptionNumber ?? Commodity.LabelNumber}\t{Commodity.Amount}"
: $"{Commodity.Name}\t{Commodity.Amount}";
LabelTo(from, 1060658, args); // ~1_val~: ~2_val~
LabelTo(
from,
1060658, // ~1_val~: ~2_val~
Commodity.Name == null
? $"#{(Commodity as ICommodity)?.DescriptionNumber ?? Commodity.LabelNumber}\t{Commodity.Amount}"
: $"{Commodity.Name}\t{Commodity.Amount}"
);
}
}