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

Ninja Darts and Shuriken should use combat checks, never 100% chance of hit. Should trigger Evil Omen poison level increase. Missed shots should not consume poison chg, but empty ammo clears weapon poison. Code overhaul.

Browse source
This commit is contained in:
xavier 2010-12-31 20:28:58 +00:00
parent c81a87394d
commit 33de7434c5
11 changed files with 520 additions and 571 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Spells/Chivalry/NobleSacrifice.cs
View file

@ -140,7 +140,7 @@ namespace Server.Spells.Chivalry
sendEffect = true;
}
if ( EvilOmenSpell.CheckEffect( m ) )
if ( EvilOmenSpell.TryEndEffect( m ) )
sendEffect = true;
if ( StrangleSpell.RemoveCurse( m ) )

2
Scripts/Spells/Chivalry/RemoveCurse.cs
View file

@ -81,7 +81,7 @@ namespace Server.Spells.Chivalry
m.Paralyzed = false;
EvilOmenSpell.CheckEffect( m );
EvilOmenSpell.TryEndEffect( m );
StrangleSpell.RemoveCurse( m );
CorpseSkinSpell.RemoveCurse( m );
CurseSpell.RemoveEffect( m );

78
Scripts/Spells/Necromancy/EvilOmen.cs
View file

@ -1,8 +1,6 @@
using System;
using System.Collections;
using Server.Mobiles;
using Server.Network;
using Server.Items;
using Server.Targeting;
namespace Server.Spells.Necromancy
@ -17,58 +15,59 @@ namespace Server.Spells.Necromancy
Reagent.NoxCrystal
);
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 0.75 ); } }
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds(0.75); } }
public override double RequiredSkill{ get{ return 20.0; } }
public override int RequiredMana{ get{ return 11; } }
public override double RequiredSkill { get { return 20.0; } }
public override int RequiredMana { get { return 11; } }
public EvilOmenSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
public EvilOmenSpell(Mobile caster, Item scroll)
: base(caster, scroll, m_Info)
{
}
public override void OnCast()
{
Caster.Target = new InternalTarget( this );
Caster.Target = new InternalTarget(this);
}
public void Target( Mobile m )
public void Target(Mobile m)
{
if ( !(m is BaseCreature || m is PlayerMobile) )
if (!(m is BaseCreature || m is PlayerMobile))
{
Caster.SendLocalizedMessage( 1060508 ); // You can't curse that.
Caster.SendLocalizedMessage(1060508); // You can't curse that.
}
else if ( CheckHSequence( m ) )
else if (CheckHSequence(m))
{
SpellHelper.Turn( Caster, m );
SpellHelper.Turn(Caster, m);
/* Curses the target so that the next harmful event that affects them is magnified.
* Damage to the target's hit points is increased 25%,
* the poison level of the attack will be 1 higher
* and the Resist Magic skill of the target will be fixed on 50.
*
*
* The effect lasts for one harmful event only.
*/
if ( m.Spell != null )
if (m.Spell != null)
m.Spell.OnCasterHurt();
m.PlaySound( 0xFC );
m.FixedParticles( 0x3728, 1, 13, 9912, 1150, 7, EffectLayer.Head );
m.FixedParticles( 0x3779, 1, 15, 9502, 67, 7, EffectLayer.Head );
if ( !m_Table.Contains( m ) )
m.PlaySound(0xFC);
m.FixedParticles(0x3728, 1, 13, 9912, 1150, 7, EffectLayer.Head);
m.FixedParticles(0x3779, 1, 15, 9502, 67, 7, EffectLayer.Head);
if (!m_Table.Contains(m))
{
SkillMod mod = new DefaultSkillMod( SkillName.MagicResist, false, 50.0 );
SkillMod mod = new DefaultSkillMod(SkillName.MagicResist, false, 50.0);
if ( m.Skills[SkillName.MagicResist].Base > 50.0 )
m.AddSkillMod( mod );
if (m.Skills[SkillName.MagicResist].Base > 50.0)
m.AddSkillMod(mod);
m_Table[m] = mod;
}
TimeSpan duration = TimeSpan.FromSeconds( (Caster.Skills[SkillName.SpiritSpeak].Value / 12) + 1.0 );
TimeSpan duration = TimeSpan.FromSeconds((Caster.Skills[SkillName.SpiritSpeak].Value / 12) + 1.0);
Timer.DelayCall( duration, new TimerStateCallback( EffectExpire_Callback ), m );
Timer.DelayCall(duration, new TimerStateCallback(EffectExpire_Callback), m);
}
FinishSequence();
@ -76,19 +75,27 @@ namespace Server.Spells.Necromancy
private static Hashtable m_Table = new Hashtable();
private static void EffectExpire_Callback( object state )
private static void EffectExpire_Callback(object state)
{
CheckEffect( (Mobile)state );
TryEndEffect((Mobile)state);
}
public static bool CheckEffect( Mobile m )
/*
* The naming here was confusing. Its a 1-off effect spell.
* So, we dont actually "checkeffect"; we endeffect with bool
* return to determine external behaviors.
*
* -refactored.
*/
public static bool TryEndEffect(Mobile m)
{
SkillMod mod = (SkillMod)m_Table[m];
if ( mod == null )
if (mod == null)
return false;
m_Table.Remove( m );
m_Table.Remove(m);
mod.Remove();
return true;
@ -98,20 +105,21 @@ namespace Server.Spells.Necromancy
{
private EvilOmenSpell m_Owner;
public InternalTarget( EvilOmenSpell owner ) : base( Core.ML ? 10 : 12, false, TargetFlags.Harmful )
public InternalTarget(EvilOmenSpell owner)
: base(Core.ML ? 10 : 12, false, TargetFlags.Harmful)
{
m_Owner = owner;
}
protected override void OnTarget( Mobile from, object o )
protected override void OnTarget(Mobile from, object o)
{
if ( o is Mobile )
m_Owner.Target( (Mobile) o );
if (o is Mobile)
m_Owner.Target((Mobile)o);
else
from.SendLocalizedMessage( 1060508 ); // You can't curse that.
from.SendLocalizedMessage(1060508); // You can't curse that.
}
protected override void OnTargetFinish( Mobile from )
protected override void OnTargetFinish(Mobile from)
{
m_Owner.FinishSequence();
}