feat: Adds Pre-UOTD single click support for weapons, armor, wands, and clothing (#2053)
This commit is contained in:
parent
863b4b5460
commit
3b698de556
7 changed files with 350 additions and 12 deletions
|
|
@ -1,5 +1,6 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Reflection.Metadata;
|
||||
using System.Runtime.CompilerServices;
|
||||
using ModernUO.Serialization;
|
||||
using Server.Collections;
|
||||
|
|
@ -17,6 +18,7 @@ using Server.Spells.Necromancy;
|
|||
using Server.Spells.Ninjitsu;
|
||||
using Server.Spells.Sixth;
|
||||
using Server.Spells.Spellweaving;
|
||||
using Server.Text;
|
||||
|
||||
namespace Server.Items;
|
||||
|
||||
|
|
@ -673,6 +675,7 @@ public abstract partial class BaseWeapon : Item, IWeapon, IFactionItem, ICraftab
|
|||
}
|
||||
|
||||
PlayerConstructed = true;
|
||||
Identified = true;
|
||||
|
||||
var resourceType = typeRes ?? craftItem.Resources[0].ItemType;
|
||||
|
||||
|
|
@ -728,21 +731,18 @@ public abstract partial class BaseWeapon : Item, IWeapon, IFactionItem, ICraftab
|
|||
{
|
||||
case CraftResource.DullCopper:
|
||||
{
|
||||
Identified = true;
|
||||
DurabilityLevel = WeaponDurabilityLevel.Durable;
|
||||
AccuracyLevel = WeaponAccuracyLevel.Accurate;
|
||||
break;
|
||||
}
|
||||
case CraftResource.ShadowIron:
|
||||
{
|
||||
Identified = true;
|
||||
DurabilityLevel = WeaponDurabilityLevel.Durable;
|
||||
DamageLevel = WeaponDamageLevel.Ruin;
|
||||
break;
|
||||
}
|
||||
case CraftResource.Copper:
|
||||
{
|
||||
Identified = true;
|
||||
DurabilityLevel = WeaponDurabilityLevel.Fortified;
|
||||
DamageLevel = WeaponDamageLevel.Ruin;
|
||||
AccuracyLevel = WeaponAccuracyLevel.Surpassingly;
|
||||
|
|
@ -750,7 +750,6 @@ public abstract partial class BaseWeapon : Item, IWeapon, IFactionItem, ICraftab
|
|||
}
|
||||
case CraftResource.Bronze:
|
||||
{
|
||||
Identified = true;
|
||||
DurabilityLevel = WeaponDurabilityLevel.Fortified;
|
||||
DamageLevel = WeaponDamageLevel.Might;
|
||||
AccuracyLevel = WeaponAccuracyLevel.Surpassingly;
|
||||
|
|
@ -758,7 +757,6 @@ public abstract partial class BaseWeapon : Item, IWeapon, IFactionItem, ICraftab
|
|||
}
|
||||
case CraftResource.Gold:
|
||||
{
|
||||
Identified = true;
|
||||
DurabilityLevel = WeaponDurabilityLevel.Indestructible;
|
||||
DamageLevel = WeaponDamageLevel.Force;
|
||||
AccuracyLevel = WeaponAccuracyLevel.Eminently;
|
||||
|
|
@ -766,7 +764,6 @@ public abstract partial class BaseWeapon : Item, IWeapon, IFactionItem, ICraftab
|
|||
}
|
||||
case CraftResource.Agapite:
|
||||
{
|
||||
Identified = true;
|
||||
DurabilityLevel = WeaponDurabilityLevel.Indestructible;
|
||||
DamageLevel = WeaponDamageLevel.Power;
|
||||
AccuracyLevel = WeaponAccuracyLevel.Eminently;
|
||||
|
|
@ -774,7 +771,6 @@ public abstract partial class BaseWeapon : Item, IWeapon, IFactionItem, ICraftab
|
|||
}
|
||||
case CraftResource.Verite:
|
||||
{
|
||||
Identified = true;
|
||||
DurabilityLevel = WeaponDurabilityLevel.Indestructible;
|
||||
DamageLevel = WeaponDamageLevel.Power;
|
||||
AccuracyLevel = WeaponAccuracyLevel.Exceedingly;
|
||||
|
|
@ -782,7 +778,6 @@ public abstract partial class BaseWeapon : Item, IWeapon, IFactionItem, ICraftab
|
|||
}
|
||||
case CraftResource.Valorite:
|
||||
{
|
||||
Identified = true;
|
||||
DurabilityLevel = WeaponDurabilityLevel.Indestructible;
|
||||
DamageLevel = WeaponDamageLevel.Vanq;
|
||||
AccuracyLevel = WeaponAccuracyLevel.Supremely;
|
||||
|
|
@ -3332,6 +3327,12 @@ public abstract partial class BaseWeapon : Item, IWeapon, IFactionItem, ICraftab
|
|||
|
||||
public override void OnSingleClick(Mobile from)
|
||||
{
|
||||
if (!Core.UOTD)
|
||||
{
|
||||
OnSingleClickPreUOTD(from);
|
||||
return;
|
||||
}
|
||||
|
||||
var attrs = new List<EquipInfoAttribute>();
|
||||
|
||||
if (DisplayLootType)
|
||||
|
|
@ -3423,6 +3424,130 @@ public abstract partial class BaseWeapon : Item, IWeapon, IFactionItem, ICraftab
|
|||
from.NetState.SendDisplayEquipmentInfo(Serial, number, _crafter, false, attrs);
|
||||
}
|
||||
|
||||
public virtual void OnSingleClickPreUOTD(Mobile from)
|
||||
{
|
||||
var isMagicItem = _durabilityLevel > WeaponDurabilityLevel.Regular ||
|
||||
_accuracyLevel > WeaponAccuracyLevel.Regular ||
|
||||
_damageLevel > WeaponDamageLevel.Regular ||
|
||||
_slayer != SlayerName.None;
|
||||
|
||||
if (isMagicItem && !_identified)
|
||||
{
|
||||
LabelTo(from, $"an unidentified {Name ?? Localization.GetText(LabelNumber).ToLowerInvariant()}");
|
||||
return;
|
||||
}
|
||||
|
||||
var name = Name;
|
||||
var articleAnName = (TileData.ItemTable[ItemID].Flags & TileFlag.ArticleAn) != 0;
|
||||
|
||||
if (isMagicItem)
|
||||
{
|
||||
var builder = ValueStringBuilder.Create(128);
|
||||
|
||||
var durabilityText = DurabilityText(out var articleAnDurability);
|
||||
if (durabilityText != null)
|
||||
{
|
||||
builder.AppendSpaceWithArticle(durabilityText, articleAnDurability);
|
||||
}
|
||||
|
||||
var accuracyText = AccuracyText(out var articleAnAccuracy);
|
||||
if (accuracyText != null)
|
||||
{
|
||||
builder.AppendSpaceWithArticle(accuracyText, articleAnAccuracy);
|
||||
}
|
||||
|
||||
var slayerEntry = SlayerGroup.GetEntryByName(_slayer);
|
||||
if (slayerEntry != null)
|
||||
{
|
||||
builder.AppendSpaceWithArticle(slayerEntry.SlayerText(out var articleAnSlayer), articleAnSlayer);
|
||||
}
|
||||
|
||||
if (name == null)
|
||||
{
|
||||
builder.AppendSpaceWithArticle(Localization.GetText(LabelNumber).ToLowerInvariant(), articleAnName);
|
||||
}
|
||||
else if (builder.Length != 0)
|
||||
{
|
||||
builder.Append($" {name}");
|
||||
}
|
||||
else
|
||||
{
|
||||
builder.Append(name);
|
||||
}
|
||||
|
||||
var weaponDamageText = WeaponDamageText;
|
||||
if (weaponDamageText != null)
|
||||
{
|
||||
builder.Append($" of {weaponDamageText}");
|
||||
}
|
||||
|
||||
// TODO: Spells (of Ghoul's Touch)
|
||||
|
||||
LabelTo(from, builder.ToString());
|
||||
builder.Dispose();
|
||||
return;
|
||||
}
|
||||
|
||||
name ??= $"{(articleAnName ? "an" : "a")} {Localization.GetText(LabelNumber).ToLowerInvariant()}";
|
||||
|
||||
if (Crafter == null)
|
||||
{
|
||||
LabelTo(from, Quality == WeaponQuality.Exceptional ? $"{name} of exceptional quality" : name);
|
||||
return;
|
||||
}
|
||||
|
||||
LabelTo(
|
||||
from,
|
||||
Quality == WeaponQuality.Exceptional
|
||||
? $"{name} crafted with exceptional quality by {Crafter}"
|
||||
: $"{name} crafted by {Crafter}"
|
||||
);
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
private string DurabilityText(out bool articleAn)
|
||||
{
|
||||
articleAn = _durabilityLevel is WeaponDurabilityLevel.Indestructible;
|
||||
return _durabilityLevel switch
|
||||
{
|
||||
WeaponDurabilityLevel.Durable => "durable",
|
||||
WeaponDurabilityLevel.Substantial => "substantial",
|
||||
WeaponDurabilityLevel.Massive => "massive",
|
||||
WeaponDurabilityLevel.Fortified => "fortified",
|
||||
WeaponDurabilityLevel.Indestructible => "indestructible",
|
||||
_ => null
|
||||
};
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
private string AccuracyText(out bool articleAn)
|
||||
{
|
||||
articleAn = _accuracyLevel is WeaponAccuracyLevel.Accurate or WeaponAccuracyLevel.Eminently;
|
||||
return _accuracyLevel switch
|
||||
{
|
||||
WeaponAccuracyLevel.Accurate => "accurate",
|
||||
WeaponAccuracyLevel.Surpassingly => "surpassingly accurate",
|
||||
WeaponAccuracyLevel.Eminently => "eminently accurate",
|
||||
WeaponAccuracyLevel.Exceedingly => "exceedingly accurate",
|
||||
WeaponAccuracyLevel.Supremely => "supremely accurate",
|
||||
_ => null
|
||||
};
|
||||
}
|
||||
|
||||
private string WeaponDamageText
|
||||
{
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
get => _damageLevel switch
|
||||
{
|
||||
WeaponDamageLevel.Ruin => "ruin",
|
||||
WeaponDamageLevel.Might => "might",
|
||||
WeaponDamageLevel.Force => "force",
|
||||
WeaponDamageLevel.Power => "power",
|
||||
WeaponDamageLevel.Vanq => "vanquishing",
|
||||
_ => null
|
||||
};
|
||||
}
|
||||
|
||||
public virtual int GetHitAttackSound(Mobile attacker, Mobile defender)
|
||||
{
|
||||
var sound = attacker.GetAttackSound();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue