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

Lots of generics, gm+ can see weapon/armor props without identification

Browse source
This commit is contained in:
mark 2006-06-15 08:51:40 +00:00
parent d1a8a6d75e
commit b0208aa906
7 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Scripts/Items/Armor/BaseArmor.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Server.Network;
using Server.Engines.Craft;
using Server.Factions;
@ -1520,7 +1521,7 @@ namespace Server.Items
public override void OnSingleClick( Mobile from )
{
ArrayList attrs = new ArrayList();
List<EquipInfoAttribute> attrs = new List<EquipInfoAttribute>();
if ( DisplayLootType )
{
@ -1538,7 +1539,7 @@ namespace Server.Items
if ( m_Quality == ArmorQuality.Exceptional )
attrs.Add( new EquipInfoAttribute( 1018305 - (int)m_Quality ) );
if ( m_Identified )
if ( m_Identified || from.AccessLevel >= AccessLevel.GameMaster)
{
if ( m_Durability != ArmorDurabilityLevel.Regular )
attrs.Add( new EquipInfoAttribute( 1038000 + (int)m_Durability ) );
@ -1547,9 +1548,7 @@ namespace Server.Items
attrs.Add( new EquipInfoAttribute( 1038005 + (int)m_Protection ) );
}
else if ( m_Durability != ArmorDurabilityLevel.Regular || (m_Protection > ArmorProtectionLevel.Regular && m_Protection <= ArmorProtectionLevel.Invulnerability) )
{
attrs.Add( new EquipInfoAttribute( 1038000 ) ); // Unidentified
}
int number;
@ -1566,7 +1565,7 @@ namespace Server.Items
if ( attrs.Count == 0 && Crafter == null && Name != null )
return;
EquipmentInfo eqInfo = new EquipmentInfo( number, m_Crafter, false, (EquipInfoAttribute[])attrs.ToArray( typeof( EquipInfoAttribute ) ) );
EquipmentInfo eqInfo = new EquipmentInfo( number, m_Crafter, false, attrs.ToArray() );
from.Send( new DisplayEquipmentInfo( this, eqInfo ) );
}

4
Scripts/Items/Weapons/BaseWeapon.cs
View file

@ -3264,7 +3264,7 @@ namespace Server.Items
if ( m_Quality == WeaponQuality.Exceptional )
attrs.Add( new EquipInfoAttribute( 1018305 - (int)m_Quality ) );
if ( m_Identified )
if ( m_Identified || from.AccessLevel >= AccessLevel.GameMaster )
{
if( m_Slayer != SlayerName.None )
{
@ -3290,9 +3290,7 @@ namespace Server.Items
attrs.Add( new EquipInfoAttribute( 1038010 + (int)m_AccuracyLevel ) );
}
else if( m_Slayer != SlayerName.None || m_Slayer2 != SlayerName.None || m_DurabilityLevel != WeaponDurabilityLevel.Regular || m_DamageLevel != WeaponDamageLevel.Regular || m_AccuracyLevel != WeaponAccuracyLevel.Regular )
{
attrs.Add( new EquipInfoAttribute( 1038000 ) ); // Unidentified
}
if ( m_Poison != null && m_PoisonCharges > 0 )
attrs.Add( new EquipInfoAttribute( 1017383, m_PoisonCharges ) );