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

Fixes casting checks

Browse source
This commit is contained in:
Kamron Batman 2018-08-19 01:38:55 +08:00
parent 7ea00fbf4f
commit 03dd5f1926
431 changed files with 5616 additions and 6250 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Scripts/Items/Clothing/BaseClothing.cs
View file

@ -184,29 +184,29 @@ namespace Server.Items
if ( !Ethics.Ethic.CheckEquip( from, this ) )
return false;
if( from.AccessLevel < AccessLevel.GameMaster )
if ( from.AccessLevel < AccessLevel.GameMaster )
{
if( RequiredRace != null && from.Race != RequiredRace )
if ( RequiredRace != null && from.Race != RequiredRace )
{
if( RequiredRace == Race.Elf )
if ( RequiredRace == Race.Elf )
from.SendLocalizedMessage( 1072203 ); // Only Elves may use this.
else
from.SendMessage( "Only {0} may use this.", RequiredRace.PluralName );
return false;
}
else if( !AllowMaleWearer && !from.Female )
else if ( !AllowMaleWearer && !from.Female )
{
if( AllowFemaleWearer )
if ( AllowFemaleWearer )
from.SendLocalizedMessage( 1010388 ); // Only females can wear this.
else
from.SendMessage( "You may not wear this." );
return false;
}
else if( !AllowFemaleWearer && from.Female )
else if ( !AllowFemaleWearer && from.Female )
{
if( AllowMaleWearer )
if ( AllowMaleWearer )
from.SendLocalizedMessage( 1063343 ); // Only males can wear this.
else
from.SendMessage( "You may not wear this." );
@ -218,7 +218,7 @@ namespace Server.Items
int strBonus = ComputeStatBonus( StatType.Str );
int strReq = ComputeStatReq( StatType.Str );
if( from.Str < strReq || (from.Str + strBonus) < 1 )
if ( from.Str < strReq || (from.Str + strBonus) < 1 )
{
from.SendLocalizedMessage( 500213 ); // You are not strong enough to equip that.
return false;
@ -296,9 +296,9 @@ namespace Server.Items
{
BaseClothing clothing = (BaseClothing)item;
if( clothing.RequiredRace != null && m.Race != clothing.RequiredRace )
if ( clothing.RequiredRace != null && m.Race != clothing.RequiredRace )
{
if( clothing.RequiredRace == Race.Elf )
if ( clothing.RequiredRace == Race.Elf )
m.SendLocalizedMessage( 1072203 ); // Only Elves may use this.
else
m.SendMessage( "Only {0} may use this.", clothing.RequiredRace.PluralName );
@ -568,7 +568,7 @@ namespace Server.Items
if ( m_Quality == ClothingQuality.Exceptional )
list.Add( 1060636 ); // exceptional
if( RequiredRace == Race.Elf )
if ( RequiredRace == Race.Elf )
list.Add( 1075086 ); // Elves Only
if ( m_AosSkillBonuses != null )

4
Scripts/Items/Clothing/Hats.cs
View file

@ -57,7 +57,7 @@ namespace Server.Items
{
base.AddEquipInfoAttributes( from, attrs );
if( m_IsShipwreckedItem )
if ( m_IsShipwreckedItem )
attrs.Add( new EquipInfoAttribute( 1041645 ) ); // recovered from a shipwreck
}
@ -73,7 +73,7 @@ namespace Server.Items
{
Quality = (ClothingQuality)quality;
if( Quality == ClothingQuality.Exceptional )
if ( Quality == ClothingQuality.Exceptional )
DistributeBonuses( (tool is BaseRunicTool ? 6 : (Core.SE ? 15 : 14)) ); //BLAME OSI. (We can't confirm it's an OSI bug yet.)
return base.OnCraft( quality, makersMark, from, craftSystem, typeRes, tool, craftItem, resHue );

4
Scripts/Items/Clothing/OuterTorso.cs
View file

@ -197,7 +197,7 @@ namespace Server.Items
writer.Write( m_DecayTimer != null );
if( m_DecayTimer != null )
if ( m_DecayTimer != null )
writer.WriteDeltaTime( m_DecayTime );
}
@ -211,7 +211,7 @@ namespace Server.Items
{
case 2:
{
if( reader.ReadBool() )
if ( reader.ReadBool() )
{
m_DecayTime = reader.ReadDeltaTime();
BeginDecay( m_DecayTime - DateTime.UtcNow );

2
Scripts/Items/Clothing/Shoes.cs
View file

@ -18,7 +18,7 @@ namespace Server.Items
public override bool Scissor( Mobile from, Scissors scissors )
{
if( DefaultResource == CraftResource.None )
if ( DefaultResource == CraftResource.None )
return base.Scissor( from, scissors );
from.SendLocalizedMessage( 502440 ); // Scissors can not be used on that to produce anything.