This commit is contained in:
parent
73a43ed06a
commit
1a02422299
10 changed files with 368 additions and 292 deletions
|
|
@ -26,7 +26,9 @@ namespace Server.Gumps
|
||||||
if ( summon != null )
|
if ( summon != null )
|
||||||
{
|
{
|
||||||
if ( !summon.SetControlMaster( from ) )
|
if ( !summon.SetControlMaster( from ) )
|
||||||
from.SendLocalizedMessage( 1049607 ); // You have too many followers to control that creature.
|
{
|
||||||
|
summon.Delete();
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
from.SendLocalizedMessage( 1049666 ); // Your pet has bonded with you!
|
from.SendLocalizedMessage( 1049666 ); // Your pet has bonded with you!
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@ namespace Server.Gumps
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_Info.Level = level;
|
m_Info.Level = level;
|
||||||
state.Mobile.SendLocalizedMessage( 1061280 ); // New access level set.
|
state.Mobile.SendLocalizedMessage( 1061280 ); // New access level set.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1619,10 +1619,12 @@ namespace Server.Mobiles
|
||||||
{
|
{
|
||||||
Name = creature.Name;
|
Name = creature.Name;
|
||||||
}
|
}
|
||||||
else if( this.ItemID == ShrinkTable.DefaultItemID || creature.GetType().IsDefined( typeof( FriendlyNameAttribute ), false ) )
|
else if( this.ItemID == ShrinkTable.DefaultItemID || creature.GetType().IsDefined( typeof( FriendlyNameAttribute ), false ) || creature is Reptalon )
|
||||||
Name = FriendlyNameAttribute.GetFriendlyNameFor( creature.GetType() ).ToString();
|
Name = FriendlyNameAttribute.GetFriendlyNameFor( creature.GetType() ).ToString();
|
||||||
|
|
||||||
//(As Per OSI)No name. Normally, set by the ItemID of the Shrink Item unless we either explicitly set it with an Attribute, or, no lookup found
|
//(As Per OSI)No name. Normally, set by the ItemID of the Shrink Item unless we either explicitly set it with an Attribute, or, no lookup found
|
||||||
|
|
||||||
|
Hue = creature.Hue;
|
||||||
}
|
}
|
||||||
|
|
||||||
public TransferItem( Serial serial )
|
public TransferItem( Serial serial )
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -278,6 +278,8 @@ namespace Server.Mobiles
|
||||||
#region Bonding
|
#region Bonding
|
||||||
public const bool BondingEnabled = true;
|
public const bool BondingEnabled = true;
|
||||||
|
|
||||||
|
public virtual bool IsNecromancer { get { return ( Skills[ SkillName.Necromancy ].Value > 50 ); } }
|
||||||
|
|
||||||
public virtual bool IsBondable{ get{ return ( BondingEnabled && !Summoned ); } }
|
public virtual bool IsBondable{ get{ return ( BondingEnabled && !Summoned ); } }
|
||||||
public virtual TimeSpan BondingDelay{ get{ return TimeSpan.FromDays( 7.0 ); } }
|
public virtual TimeSpan BondingDelay{ get{ return TimeSpan.FromDays( 7.0 ); } }
|
||||||
public virtual TimeSpan BondingAbandonDelay{ get{ return TimeSpan.FromDays( 1.0 ); } }
|
public virtual TimeSpan BondingAbandonDelay{ get{ return TimeSpan.FromDays( 1.0 ); } }
|
||||||
|
|
|
||||||
|
|
@ -191,6 +191,9 @@ namespace Server.Mobiles
|
||||||
SetResistance( ResistanceType.Poison, 30 );
|
SetResistance( ResistanceType.Poison, 30 );
|
||||||
SetResistance( ResistanceType.Energy, 30 );
|
SetResistance( ResistanceType.Energy, 30 );
|
||||||
|
|
||||||
|
SetSkill( SkillName.Necromancy, 120, 120.0 );
|
||||||
|
SetSkill( SkillName.SpiritSpeak, 120.0, 120.0 );
|
||||||
|
|
||||||
SetSkill( SkillName.DetectHidden, 80.0 );
|
SetSkill( SkillName.DetectHidden, 80.0 );
|
||||||
SetSkill( SkillName.EvalInt, 100.0 );
|
SetSkill( SkillName.EvalInt, 100.0 );
|
||||||
SetSkill( SkillName.Magery, 100.0 );
|
SetSkill( SkillName.Magery, 100.0 );
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,10 @@ namespace Server.Mobiles
|
||||||
SetResistance( ResistanceType.Poison, 55, 65 );
|
SetResistance( ResistanceType.Poison, 55, 65 );
|
||||||
SetResistance( ResistanceType.Energy, 40, 50 );
|
SetResistance( ResistanceType.Energy, 40, 50 );
|
||||||
|
|
||||||
|
|
||||||
|
SetSkill( SkillName.Necromancy, 120, 120.0 );
|
||||||
|
SetSkill( SkillName.SpiritSpeak, 120.0, 120.0 );
|
||||||
|
|
||||||
SetSkill( SkillName.EvalInt, 100.0 );
|
SetSkill( SkillName.EvalInt, 100.0 );
|
||||||
SetSkill( SkillName.Magery, 70.1, 80.0 );
|
SetSkill( SkillName.Magery, 70.1, 80.0 );
|
||||||
SetSkill( SkillName.Meditation, 85.1, 95.0 );
|
SetSkill( SkillName.Meditation, 85.1, 95.0 );
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,9 @@ namespace Server.Mobiles
|
||||||
SetResistance( ResistanceType.Poison, 50, 60 );
|
SetResistance( ResistanceType.Poison, 50, 60 );
|
||||||
SetResistance( ResistanceType.Energy, 40, 50 );
|
SetResistance( ResistanceType.Energy, 40, 50 );
|
||||||
|
|
||||||
|
SetSkill( SkillName.Necromancy, 120, 120.0 );
|
||||||
|
SetSkill( SkillName.SpiritSpeak, 120.0, 120.0 );
|
||||||
|
|
||||||
SetSkill( SkillName.EvalInt, 90.1, 100.0 );
|
SetSkill( SkillName.EvalInt, 90.1, 100.0 );
|
||||||
SetSkill( SkillName.Magery, 90.1, 100.0 );
|
SetSkill( SkillName.Magery, 90.1, 100.0 );
|
||||||
SetSkill( SkillName.MagicResist, 150.5, 200.0 );
|
SetSkill( SkillName.MagicResist, 150.5, 200.0 );
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ using System.Collections.Generic;
|
||||||
using Server.Network;
|
using Server.Network;
|
||||||
using Server.Items;
|
using Server.Items;
|
||||||
using Server.Targeting;
|
using Server.Targeting;
|
||||||
|
using Server.Mobiles;
|
||||||
|
|
||||||
namespace Server.Spells.Necromancy
|
namespace Server.Spells.Necromancy
|
||||||
{
|
{
|
||||||
|
|
@ -67,13 +68,13 @@ namespace Server.Spells.Necromancy
|
||||||
targets.Add( m );
|
targets.Add( m );
|
||||||
|
|
||||||
foreach( Mobile targ in m.GetMobilesInRange( 2 ) )
|
foreach( Mobile targ in m.GetMobilesInRange( 2 ) )
|
||||||
if( ( targ != Caster && m != targ ) && ( SpellHelper.ValidIndirectTarget( Caster, targ ) && Caster.CanBeHarmful( targ, false) ) )
|
if(Caster is BaseCreature && targ is BaseCreature && !((BaseCreature)targ).Controlled && !((BaseCreature)targ).Summoned )
|
||||||
targets.Add( targ );
|
if( ( targ != Caster && m != targ ) && ( SpellHelper.ValidIndirectTarget( Caster, targ ) && Caster.CanBeHarmful( targ, false) ) )
|
||||||
|
targets.Add( targ );
|
||||||
|
|
||||||
for( int i = 0; i < targets.Count; ++i )
|
for( int i = 0; i < targets.Count; ++i )
|
||||||
{
|
{
|
||||||
Mobile targ = targets[i];
|
Mobile targ = targets[i];
|
||||||
|
|
||||||
int num;
|
int num;
|
||||||
|
|
||||||
if( targ.InRange( m.Location, 0 ) )
|
if( targ.InRange( m.Location, 0 ) )
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using Server.Network;
|
|
||||||
using Server.Items;
|
using Server.Items;
|
||||||
using Server.Targeting;
|
using Server.Mobiles;
|
||||||
|
|
||||||
namespace Server.Spells.Necromancy
|
namespace Server.Spells.Necromancy
|
||||||
{
|
{
|
||||||
|
|
@ -19,18 +18,20 @@ namespace Server.Spells.Necromancy
|
||||||
|
|
||||||
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
|
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 1.5 ); } }
|
||||||
|
|
||||||
public override double RequiredSkill{ get{ return 60.0; } }
|
public override double RequiredSkill { get { return 60.0; } }
|
||||||
public override int RequiredMana{ get{ return 23; } }
|
|
||||||
|
|
||||||
public WitherSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
|
public override int RequiredMana { get { return 23; } }
|
||||||
|
|
||||||
|
public WitherSpell( Mobile caster, Item scroll )
|
||||||
|
: base( caster, scroll, m_Info )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public override bool DelayedDamage{ get{ return false; } }
|
public override bool DelayedDamage { get { return false; } }
|
||||||
|
|
||||||
public override void OnCast()
|
public override void OnCast()
|
||||||
{
|
{
|
||||||
if ( CheckSequence() )
|
if( CheckSequence() )
|
||||||
{
|
{
|
||||||
/* Creates a withering frost around the Caster,
|
/* Creates a withering frost around the Caster,
|
||||||
* which deals Cold Damage to all valid targets in a radius of 5 tiles.
|
* which deals Cold Damage to all valid targets in a radius of 5 tiles.
|
||||||
|
|
@ -38,36 +39,36 @@ namespace Server.Spells.Necromancy
|
||||||
|
|
||||||
Map map = Caster.Map;
|
Map map = Caster.Map;
|
||||||
|
|
||||||
if ( map != null )
|
if( map != null )
|
||||||
{
|
{
|
||||||
List<Mobile> targets = new List<Mobile>();
|
List<Mobile> targets = new List<Mobile>();
|
||||||
|
|
||||||
foreach ( Mobile m in Caster.GetMobilesInRange( Core.ML ? 4 : 5 ) )
|
foreach( Mobile m in Caster.GetMobilesInRange( Core.ML ? 4 : 5 ) )
|
||||||
if ( Caster != m && Caster.InLOS( m ) && SpellHelper.ValidIndirectTarget( Caster, m ) && Caster.CanBeHarmful( m, false ) )
|
if( Caster != m && Caster.InLOS( m ) && SpellHelper.ValidIndirectTarget( Caster, m ) && Caster.CanBeHarmful( m, false ) )
|
||||||
targets.Add( m );
|
targets.Add( m );
|
||||||
|
|
||||||
Effects.PlaySound( Caster.Location, map, 0x1FB );
|
Effects.PlaySound( Caster.Location, map, 0x1FB );
|
||||||
Effects.PlaySound( Caster.Location, map, 0x10B );
|
Effects.PlaySound( Caster.Location, map, 0x10B );
|
||||||
Effects.SendLocationParticles( EffectItem.Create( Caster.Location, map, EffectItem.DefaultDuration ), 0x37CC, 1, 40, 97, 3, 9917, 0 );
|
Effects.SendLocationParticles( EffectItem.Create( Caster.Location, map, EffectItem.DefaultDuration ), 0x37CC, 1, 40, 97, 3, 9917, 0 );
|
||||||
|
|
||||||
for ( int i = 0; i < targets.Count; ++i )
|
for( int i = 0; i < targets.Count; ++i )
|
||||||
{
|
{
|
||||||
Mobile m = targets[i];
|
Mobile m = targets[ i ];
|
||||||
|
|
||||||
Caster.DoHarmful( m );
|
Caster.DoHarmful( m );
|
||||||
m.FixedParticles( 0x374A, 1, 15, 9502, 97, 3, (EffectLayer)255 );
|
m.FixedParticles( 0x374A, 1, 15, 9502, 97, 3, (EffectLayer)255 );
|
||||||
|
|
||||||
double damage = Utility.RandomMinMax( 30, 35 );
|
double damage = Utility.RandomMinMax( 30, 35 );
|
||||||
|
|
||||||
damage *= (300 + (m.Karma / 100) + (GetDamageSkill( Caster ) * 10));
|
damage *= ( 300 + ( m.Karma / 100 ) + ( GetDamageSkill( Caster ) * 10 ) );
|
||||||
damage /= 1000;
|
damage /= 1000;
|
||||||
|
|
||||||
int sdiBonus = AosAttributes.GetValue( Caster, AosAttribute.SpellDamage );
|
int sdiBonus = AosAttributes.GetValue( Caster, AosAttribute.SpellDamage );
|
||||||
|
|
||||||
// PvP spell damage increase cap of 15% from an item’s magic property in Publish 33(SE)
|
// PvP spell damage increase cap of 15% from an item’s magic property in Publish 33(SE)
|
||||||
if ( Core.SE && m.Player && Caster.Player && sdiBonus > 15 )
|
if( Core.SE && m.Player && Caster.Player && sdiBonus > 15 )
|
||||||
sdiBonus = 15;
|
sdiBonus = 15;
|
||||||
|
|
||||||
damage *= ( 100 + sdiBonus );
|
damage *= ( 100 + sdiBonus );
|
||||||
damage /= 100;
|
damage /= 100;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue