bug fixes

pets can no longer be renamed while in jail
This commit is contained in:
asayre 2006-08-14 07:41:26 +00:00
parent 8150706a3c
commit c26e081c58
12 changed files with 181 additions and 134 deletions

View file

@ -131,8 +131,8 @@ namespace Server.Accounting
/// </summary>
public string NewCryptPassword
{
get { return m_CryptPassword; }
set { m_CryptPassword = value; }
get { return m_NewCryptPassword; }
set { m_NewCryptPassword = value; }
}
/// <summary>

View file

@ -4271,7 +4271,7 @@ namespace Server.Mobiles
{
bool ret = base.CanBeRenamedBy( from );
if ( Controlled && from == ControlMaster )
if ( Controlled && from == ControlMaster && !from.Region.IsPartOf( typeof( Jail ) ) )
ret = true;
return ret;

View file

@ -51,8 +51,7 @@ namespace Server.Engines.Craft
{
if( targeted is PlayerMobile )
{
foreach( KeyValuePair<int, Recipe> kvp in m_Recipes )
((PlayerMobile)targeted).AcquireRecipe( kvp.Key );
((PlayerMobile)targeted).ResetRecipes();
m.SendMessage( "They forget all their recipies." );
}

View file

@ -50,6 +50,7 @@ namespace Server.Items
public RecipeScroll( int recipeID )
: base( 0x2831 )
{
m_RecipeID = recipeID;
}
public RecipeScroll( Serial serial )

View file

@ -43,9 +43,9 @@ namespace Server.Items
from.Target = new BladedItemTarget( this );
}
public override void OnHit( Mobile attacker, Mobile defender )
public override void OnHit( Mobile attacker, Mobile defender, double damageBonus )
{
base.OnHit( attacker, defender );
base.OnHit( attacker, defender, damageBonus );
if ( !Core.AOS && Poison != null && PoisonCharges > 0 )
{

View file

@ -1264,7 +1264,7 @@ namespace Server.Misc
return item;
}
private static void AddSkillItems( SkillName skill, Mobile m )
private static void AddSkillItems( SkillName skill, Mobile m )
{
bool elf = (m.Race == Race.Elf);

View file

@ -961,6 +961,8 @@ namespace Server.Guilds
}
set
{
this.AddMember( value ); //Also removes from old guild.
if( m_Leader is PlayerMobile && m_Leader.Guild == this )
((PlayerMobile)m_Leader).GuildRank = RankDefinition.Member;

View file

@ -65,7 +65,7 @@ namespace Server
typeof( Bow ), typeof( Crossbow ), typeof( HeavyCrossbow )
};
public static Type[] RangedWeaponTypes{ get{ return m_WeaponTypes; } }
public static Type[] RangedWeaponTypes{ get{ return m_RangedWeaponTypes; } }
private static Type[] m_SEArmorTypes = new Type[]
{

View file

@ -34,8 +34,6 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( Utility.RandomBool() ? (Item)new QuarterStaff() : (Item)new ShepherdsCrook() );
Item item = FindItemOnLayer( Layer.Pants );
if ( item != null )

View file

@ -38,8 +38,17 @@ namespace Server.SkillHandlers
{
BaseArmor armor = m.Items[i] as BaseArmor;
if( armor != null && armor.ArmorAttributes.MageArmor == 0 )
ar += m_ArmorTable[(int)armor.MaterialType, (int)armor.BodyPosition];
if( armor == null )
continue;
int materialType = (int)armor.MaterialType;
int bodyPosition = (int)armor.BodyPosition;
if( materialType >= m_ArmorTable.GetLength( 0 ) || bodyPosition >= m_ArmorTable.GetLength( 1 ) )
continue;
if( armor.ArmorAttributes.MageArmor == 0 )
ar += m_ArmorTable[materialType, bodyPosition];
}
return ar;