This commit is contained in:
parent
2874ee7e23
commit
d94dced436
10 changed files with 43 additions and 14 deletions
|
|
@ -1922,7 +1922,7 @@ namespace Server.Mobiles
|
|||
|
||||
if ( master != null && master == from ) //So friends can't start the bonding process
|
||||
{
|
||||
if ( m_dMinTameSkill <= 29.1 || master.Skills[SkillName.AnimalTaming].Base >= m_dMinTameSkill || ( this is LesserHiryu && master.Skills[SkillName.Bushido].Base >= 90.0 ) )
|
||||
if ( m_dMinTameSkill <= 29.1 || master.Skills[SkillName.AnimalTaming].Base >= m_dMinTameSkill || OverrideBondingReqs() )
|
||||
{
|
||||
if ( BondingBegin == DateTime.MinValue )
|
||||
{
|
||||
|
|
@ -1953,6 +1953,11 @@ namespace Server.Mobiles
|
|||
|
||||
#endregion
|
||||
|
||||
public virtual bool OverrideBondingReqs()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
public virtual bool CanAngerOnTame{ get{ return false; } }
|
||||
|
||||
#region OnAction[...]
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ namespace Server.Engines.Craft
|
|||
|
||||
int resIndex = ( context == null ? -1 : context.LastResourceIndex2 );
|
||||
|
||||
Type resourceType = craftSystem.CraftSubRes.ResType;
|
||||
Type resourceType = craftSystem.CraftSubRes2.ResType;
|
||||
|
||||
if ( resIndex > -1 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -522,6 +522,8 @@ namespace Server.Items
|
|||
|
||||
if( --pigment.UsesRemaining <= 0 )
|
||||
pigment.Delete();
|
||||
|
||||
from.PlaySound(0x23E); // As per OSI TC1
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -89,7 +89,9 @@ namespace Server.Items
|
|||
eq.CurArcaneCharges += charges;
|
||||
|
||||
from.SendMessage( "You recharge the item." );
|
||||
Delete();
|
||||
if ( Amount <= 1 )
|
||||
Delete();
|
||||
else Amount--;
|
||||
}
|
||||
}
|
||||
else if ( from.Skills[SkillName.Tailoring].Value >= 80.0 )
|
||||
|
|
@ -117,7 +119,9 @@ namespace Server.Items
|
|||
item.Hue = DefaultArcaneHue;
|
||||
|
||||
from.SendMessage( "You enhance the item with your gem." );
|
||||
Delete();
|
||||
if ( Amount <= 1 )
|
||||
Delete();
|
||||
else Amount--;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -73,8 +73,8 @@ namespace Server.Mobiles
|
|||
SetSkill( SkillName.Tactics, 100.1, 110.0 );
|
||||
SetSkill( SkillName.Wrestling, 100.1, 120.0 );
|
||||
|
||||
Fame = 18000;
|
||||
Karma = -18000;
|
||||
Fame = 10000;
|
||||
Karma = 10000;
|
||||
|
||||
Tamable = true;
|
||||
ControlSlots = 3;
|
||||
|
|
@ -85,6 +85,13 @@ namespace Server.Mobiles
|
|||
}
|
||||
|
||||
|
||||
public override bool OverrideBondingReqs()
|
||||
{
|
||||
if ( ControlMaster.Skills[SkillName.Bushido].Base >= 90.0 )
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
public override int GetAngerSound()
|
||||
{
|
||||
return 0x4FE;
|
||||
|
|
|
|||
|
|
@ -122,6 +122,11 @@ namespace Server.Mobiles
|
|||
MinTameSkill = 93.9;
|
||||
}
|
||||
|
||||
public override bool OverrideBondingReqs()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public override int GetIdleSound()
|
||||
{
|
||||
return 0x2CE;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ namespace Server.Mobiles
|
|||
[Constructable]
|
||||
public WhiteWyrm () : base( AIType.AI_Mage, FightMode.Closest, 10, 1, 0.2, 0.4 )
|
||||
{
|
||||
Body = Core.AOS ? 180 : 49;
|
||||
Body = (Utility.Random(1,2)==1) ? 180 : 49;
|
||||
Name = "a white wyrm";
|
||||
BaseSoundID = 362;
|
||||
|
||||
|
|
|
|||
|
|
@ -48,6 +48,11 @@ namespace Server.Mobiles
|
|||
Hue = 0x489;
|
||||
}
|
||||
|
||||
public override bool OverrideBondingReqs()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public override int GetAngerSound()
|
||||
{
|
||||
return 0x21D;
|
||||
|
|
|
|||
|
|
@ -1800,8 +1800,9 @@ namespace Server.Mobiles
|
|||
if ( this.Alive && !wasAlive )
|
||||
{
|
||||
Item deathRobe = new DeathRobe();
|
||||
|
||||
if ( !EquipItem( deathRobe ) )
|
||||
if ( !this.Backpack.CheckHold( this, deathRobe, false, true ) )
|
||||
deathRobe.Delete();
|
||||
else if ( !EquipItem( deathRobe ) )
|
||||
deathRobe.Delete();
|
||||
}
|
||||
}
|
||||
|
|
@ -3937,7 +3938,7 @@ namespace Server.Mobiles
|
|||
{
|
||||
BaseCreature pet = AllFollowers[i] as BaseCreature;
|
||||
|
||||
if ( pet == null || pet.ControlMaster == null || ( pet.Summoned && !Core.ML ) )
|
||||
if ( pet == null || pet.ControlMaster == null || pet.Summoned )
|
||||
continue;
|
||||
|
||||
if ( pet is IMount && ((IMount)pet).Rider != null )
|
||||
|
|
|
|||
|
|
@ -46,15 +46,15 @@ namespace Server.Spells.Sixth
|
|||
|
||||
m.Hidden = true;
|
||||
|
||||
BuffInfo.RemoveBuff( m, BuffIcon.HidingAndOrStealth );
|
||||
BuffInfo.AddBuff( m, new BuffInfo( BuffIcon.Invisibility, 1075825 ) ); //Invisibility/Invisible
|
||||
|
||||
RemoveTimer( m );
|
||||
|
||||
TimeSpan duration = TimeSpan.FromSeconds( ((6 * Caster.Skills.Magery.Fixed) / 50) + 1 );
|
||||
TimeSpan duration = TimeSpan.FromSeconds( (( 1.2 * Caster.Skills.Magery.Fixed) / 10 ));
|
||||
|
||||
Timer t = new InternalTimer( m, duration );
|
||||
|
||||
BuffInfo.RemoveBuff( m, BuffIcon.HidingAndOrStealth );
|
||||
BuffInfo.AddBuff( m, new BuffInfo( BuffIcon.Invisibility, 1075825, duration, m ) ); //Invisibility/Invisible
|
||||
|
||||
m_Table[m] = t;
|
||||
|
||||
t.Start();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue