Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
Kamron Batman
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -1,206 +1,214 @@
|
|||
using System;
|
||||
using Server.Targeting;
|
||||
using Server.Mobiles;
|
||||
using Server.Engines.ConPVP;
|
||||
using Server.Items;
|
||||
using Server.Mobiles;
|
||||
using Server.Targeting;
|
||||
|
||||
namespace Server.SkillHandlers
|
||||
{
|
||||
public class Peacemaking
|
||||
{
|
||||
public static void Initialize()
|
||||
{
|
||||
SkillInfo.Table[(int)SkillName.Peacemaking].Callback = OnUse;
|
||||
}
|
||||
public class Peacemaking
|
||||
{
|
||||
public static void Initialize()
|
||||
{
|
||||
SkillInfo.Table[(int)SkillName.Peacemaking].Callback = OnUse;
|
||||
}
|
||||
|
||||
public static TimeSpan OnUse( Mobile m )
|
||||
{
|
||||
m.RevealingAction();
|
||||
public static TimeSpan OnUse(Mobile m)
|
||||
{
|
||||
m.RevealingAction();
|
||||
|
||||
BaseInstrument.PickInstrument( m, OnPickedInstrument );
|
||||
BaseInstrument.PickInstrument(m, OnPickedInstrument);
|
||||
|
||||
return TimeSpan.FromSeconds( 1.0 ); // Cannot use another skill for 1 second
|
||||
}
|
||||
return TimeSpan.FromSeconds(1.0); // Cannot use another skill for 1 second
|
||||
}
|
||||
|
||||
public static void OnPickedInstrument( Mobile from, BaseInstrument instrument )
|
||||
{
|
||||
from.RevealingAction();
|
||||
from.SendLocalizedMessage( 1049525 ); // Whom do you wish to calm?
|
||||
from.Target = new InternalTarget( from, instrument );
|
||||
from.NextSkillTime = Core.TickCount + 21600000;
|
||||
}
|
||||
public static void OnPickedInstrument(Mobile from, BaseInstrument instrument)
|
||||
{
|
||||
from.RevealingAction();
|
||||
from.SendLocalizedMessage(1049525); // Whom do you wish to calm?
|
||||
from.Target = new InternalTarget(from, instrument);
|
||||
from.NextSkillTime = Core.TickCount + 21600000;
|
||||
}
|
||||
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private BaseInstrument m_Instrument;
|
||||
private bool m_SetSkillTime = true;
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private BaseInstrument m_Instrument;
|
||||
private bool m_SetSkillTime = true;
|
||||
|
||||
public InternalTarget( Mobile from, BaseInstrument instrument ) : base( BaseInstrument.GetBardRange( from, SkillName.Peacemaking ), false, TargetFlags.None )
|
||||
{
|
||||
m_Instrument = instrument;
|
||||
}
|
||||
public InternalTarget(Mobile from, BaseInstrument instrument) : base(
|
||||
BaseInstrument.GetBardRange(from, SkillName.Peacemaking), false, TargetFlags.None)
|
||||
{
|
||||
m_Instrument = instrument;
|
||||
}
|
||||
|
||||
protected override void OnTargetFinish( Mobile from )
|
||||
{
|
||||
if ( m_SetSkillTime )
|
||||
from.NextSkillTime = Core.TickCount;
|
||||
}
|
||||
protected override void OnTargetFinish(Mobile from)
|
||||
{
|
||||
if (m_SetSkillTime)
|
||||
from.NextSkillTime = Core.TickCount;
|
||||
}
|
||||
|
||||
protected override void OnTarget( Mobile from, object targeted )
|
||||
{
|
||||
from.RevealingAction();
|
||||
protected override void OnTarget(Mobile from, object targeted)
|
||||
{
|
||||
from.RevealingAction();
|
||||
|
||||
if ( !(targeted is Mobile) )
|
||||
{
|
||||
from.SendLocalizedMessage( 1049528 ); // You cannot calm that!
|
||||
}
|
||||
else if ( from.Region.IsPartOf( typeof( Engines.ConPVP.SafeZone ) ) )
|
||||
{
|
||||
from.SendMessage( "You may not peacemake in this area." );
|
||||
}
|
||||
else if ( ((Mobile)targeted).Region.IsPartOf( typeof( Engines.ConPVP.SafeZone ) ) )
|
||||
{
|
||||
from.SendMessage( "You may not peacemake there." );
|
||||
}
|
||||
else if ( !m_Instrument.IsChildOf( from.Backpack ) )
|
||||
{
|
||||
from.SendLocalizedMessage( 1062488 ); // The instrument you are trying to play is no longer in your backpack!
|
||||
}
|
||||
else
|
||||
{
|
||||
m_SetSkillTime = false;
|
||||
from.NextSkillTime = Core.TickCount + 10000;
|
||||
if (!(targeted is Mobile))
|
||||
{
|
||||
from.SendLocalizedMessage(1049528); // You cannot calm that!
|
||||
}
|
||||
else if (from.Region.IsPartOf(typeof(SafeZone)))
|
||||
{
|
||||
from.SendMessage("You may not peacemake in this area.");
|
||||
}
|
||||
else if (((Mobile)targeted).Region.IsPartOf(typeof(SafeZone)))
|
||||
{
|
||||
from.SendMessage("You may not peacemake there.");
|
||||
}
|
||||
else if (!m_Instrument.IsChildOf(from.Backpack))
|
||||
{
|
||||
from.SendLocalizedMessage(
|
||||
1062488); // The instrument you are trying to play is no longer in your backpack!
|
||||
}
|
||||
else
|
||||
{
|
||||
m_SetSkillTime = false;
|
||||
from.NextSkillTime = Core.TickCount + 10000;
|
||||
|
||||
if ( targeted == from )
|
||||
{
|
||||
// Standard mode : reset combatants for everyone in the area
|
||||
if (targeted == from)
|
||||
{
|
||||
// Standard mode : reset combatants for everyone in the area
|
||||
|
||||
if ( !BaseInstrument.CheckMusicianship( from ) )
|
||||
{
|
||||
from.SendLocalizedMessage( 500612 ); // You play poorly, and there is no effect.
|
||||
m_Instrument.PlayInstrumentBadly( from );
|
||||
m_Instrument.ConsumeUse( from );
|
||||
}
|
||||
else if ( !from.CheckSkill( SkillName.Peacemaking, 0.0, 120.0 ) )
|
||||
{
|
||||
from.SendLocalizedMessage( 500613 ); // You attempt to calm everyone, but fail.
|
||||
m_Instrument.PlayInstrumentBadly( from );
|
||||
m_Instrument.ConsumeUse( from );
|
||||
}
|
||||
else
|
||||
{
|
||||
from.NextSkillTime = Core.TickCount + 5000;
|
||||
m_Instrument.PlayInstrumentWell( from );
|
||||
m_Instrument.ConsumeUse( from );
|
||||
if (!BaseInstrument.CheckMusicianship(from))
|
||||
{
|
||||
from.SendLocalizedMessage(500612); // You play poorly, and there is no effect.
|
||||
m_Instrument.PlayInstrumentBadly(from);
|
||||
m_Instrument.ConsumeUse(from);
|
||||
}
|
||||
else if (!from.CheckSkill(SkillName.Peacemaking, 0.0, 120.0))
|
||||
{
|
||||
from.SendLocalizedMessage(500613); // You attempt to calm everyone, but fail.
|
||||
m_Instrument.PlayInstrumentBadly(from);
|
||||
m_Instrument.ConsumeUse(from);
|
||||
}
|
||||
else
|
||||
{
|
||||
from.NextSkillTime = Core.TickCount + 5000;
|
||||
m_Instrument.PlayInstrumentWell(from);
|
||||
m_Instrument.ConsumeUse(from);
|
||||
|
||||
Map map = from.Map;
|
||||
Map map = from.Map;
|
||||
|
||||
if ( map != null )
|
||||
{
|
||||
int range = BaseInstrument.GetBardRange( from, SkillName.Peacemaking );
|
||||
if (map != null)
|
||||
{
|
||||
int range = BaseInstrument.GetBardRange(from, SkillName.Peacemaking);
|
||||
|
||||
bool calmed = false;
|
||||
bool calmed = false;
|
||||
|
||||
foreach ( Mobile m in from.GetMobilesInRange( range ) )
|
||||
{
|
||||
if ((m is BaseCreature && ((BaseCreature)m).Uncalmable) || (m is BaseCreature && ((BaseCreature)m).AreaPeaceImmune) || m == from || !from.CanBeHarmful ( m, false ))
|
||||
continue;
|
||||
foreach (Mobile m in from.GetMobilesInRange(range))
|
||||
{
|
||||
if (m is BaseCreature && ((BaseCreature)m).Uncalmable ||
|
||||
m is BaseCreature && ((BaseCreature)m).AreaPeaceImmune || m == from ||
|
||||
!from.CanBeHarmful(m, false))
|
||||
continue;
|
||||
|
||||
calmed = true;
|
||||
calmed = true;
|
||||
|
||||
m.SendLocalizedMessage( 500616 ); // You hear lovely music, and forget to continue battling!
|
||||
m.Combatant = null;
|
||||
m.Warmode = false;
|
||||
m.SendLocalizedMessage(
|
||||
500616); // You hear lovely music, and forget to continue battling!
|
||||
m.Combatant = null;
|
||||
m.Warmode = false;
|
||||
|
||||
if ( m is BaseCreature && !((BaseCreature)m).BardPacified )
|
||||
((BaseCreature)m).Pacify( from, DateTime.UtcNow + TimeSpan.FromSeconds( 1.0 ) );
|
||||
}
|
||||
if (m is BaseCreature && !((BaseCreature)m).BardPacified)
|
||||
((BaseCreature)m).Pacify(from, DateTime.UtcNow + TimeSpan.FromSeconds(1.0));
|
||||
}
|
||||
|
||||
if ( !calmed )
|
||||
from.SendLocalizedMessage( 1049648 ); // You play hypnotic music, but there is nothing in range for you to calm.
|
||||
else
|
||||
from.SendLocalizedMessage( 500615 ); // You play your hypnotic music, stopping the battle.
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Target mode : pacify a single target for a longer duration
|
||||
if (!calmed)
|
||||
from.SendLocalizedMessage(
|
||||
1049648); // You play hypnotic music, but there is nothing in range for you to calm.
|
||||
else
|
||||
from.SendLocalizedMessage(500615); // You play your hypnotic music, stopping the battle.
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Target mode : pacify a single target for a longer duration
|
||||
|
||||
Mobile targ = (Mobile)targeted;
|
||||
Mobile targ = (Mobile)targeted;
|
||||
|
||||
if ( !from.CanBeHarmful( targ, false ) )
|
||||
{
|
||||
from.SendLocalizedMessage( 1049528 );
|
||||
m_SetSkillTime = true;
|
||||
}
|
||||
else if ( targ is BaseCreature && ((BaseCreature)targ).Uncalmable )
|
||||
{
|
||||
from.SendLocalizedMessage( 1049526 ); // You have no chance of calming that creature.
|
||||
m_SetSkillTime = true;
|
||||
}
|
||||
else if ( targ is BaseCreature && ((BaseCreature)targ).BardPacified )
|
||||
{
|
||||
from.SendLocalizedMessage( 1049527 ); // That creature is already being calmed.
|
||||
m_SetSkillTime = true;
|
||||
}
|
||||
else if ( !BaseInstrument.CheckMusicianship( from ) )
|
||||
{
|
||||
from.SendLocalizedMessage( 500612 ); // You play poorly, and there is no effect.
|
||||
from.NextSkillTime = Core.TickCount + 5000;
|
||||
m_Instrument.PlayInstrumentBadly( from );
|
||||
m_Instrument.ConsumeUse( from );
|
||||
}
|
||||
else
|
||||
{
|
||||
double diff = m_Instrument.GetDifficultyFor( targ ) - 10.0;
|
||||
double music = from.Skills[SkillName.Musicianship].Value;
|
||||
if (!from.CanBeHarmful(targ, false))
|
||||
{
|
||||
from.SendLocalizedMessage(1049528);
|
||||
m_SetSkillTime = true;
|
||||
}
|
||||
else if (targ is BaseCreature && ((BaseCreature)targ).Uncalmable)
|
||||
{
|
||||
from.SendLocalizedMessage(1049526); // You have no chance of calming that creature.
|
||||
m_SetSkillTime = true;
|
||||
}
|
||||
else if (targ is BaseCreature && ((BaseCreature)targ).BardPacified)
|
||||
{
|
||||
from.SendLocalizedMessage(1049527); // That creature is already being calmed.
|
||||
m_SetSkillTime = true;
|
||||
}
|
||||
else if (!BaseInstrument.CheckMusicianship(from))
|
||||
{
|
||||
from.SendLocalizedMessage(500612); // You play poorly, and there is no effect.
|
||||
from.NextSkillTime = Core.TickCount + 5000;
|
||||
m_Instrument.PlayInstrumentBadly(from);
|
||||
m_Instrument.ConsumeUse(from);
|
||||
}
|
||||
else
|
||||
{
|
||||
double diff = m_Instrument.GetDifficultyFor(targ) - 10.0;
|
||||
double music = from.Skills[SkillName.Musicianship].Value;
|
||||
|
||||
if ( music > 100.0 )
|
||||
diff -= (music - 100.0) * 0.5;
|
||||
if (music > 100.0)
|
||||
diff -= (music - 100.0) * 0.5;
|
||||
|
||||
if ( !from.CheckTargetSkill( SkillName.Peacemaking, targ, diff - 25.0, diff + 25.0 ) )
|
||||
{
|
||||
from.SendLocalizedMessage( 1049531 ); // You attempt to calm your target, but fail.
|
||||
m_Instrument.PlayInstrumentBadly( from );
|
||||
m_Instrument.ConsumeUse( from );
|
||||
}
|
||||
else
|
||||
{
|
||||
m_Instrument.PlayInstrumentWell( from );
|
||||
m_Instrument.ConsumeUse( from );
|
||||
if (!from.CheckTargetSkill(SkillName.Peacemaking, targ, diff - 25.0, diff + 25.0))
|
||||
{
|
||||
from.SendLocalizedMessage(1049531); // You attempt to calm your target, but fail.
|
||||
m_Instrument.PlayInstrumentBadly(from);
|
||||
m_Instrument.ConsumeUse(from);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_Instrument.PlayInstrumentWell(from);
|
||||
m_Instrument.ConsumeUse(from);
|
||||
|
||||
from.NextSkillTime = Core.TickCount + 5000;
|
||||
if ( targ is BaseCreature )
|
||||
{
|
||||
BaseCreature bc = (BaseCreature)targ;
|
||||
from.NextSkillTime = Core.TickCount + 5000;
|
||||
if (targ is BaseCreature)
|
||||
{
|
||||
BaseCreature bc = (BaseCreature)targ;
|
||||
|
||||
from.SendLocalizedMessage( 1049532 ); // You play hypnotic music, calming your target.
|
||||
from.SendLocalizedMessage(1049532); // You play hypnotic music, calming your target.
|
||||
|
||||
targ.Combatant = null;
|
||||
targ.Warmode = false;
|
||||
targ.Combatant = null;
|
||||
targ.Warmode = false;
|
||||
|
||||
double seconds = 100 - (diff / 1.5);
|
||||
double seconds = 100 - diff / 1.5;
|
||||
|
||||
if ( seconds > 120 )
|
||||
seconds = 120;
|
||||
else if ( seconds < 10 )
|
||||
seconds = 10;
|
||||
if (seconds > 120)
|
||||
seconds = 120;
|
||||
else if (seconds < 10)
|
||||
seconds = 10;
|
||||
|
||||
bc.Pacify( from, DateTime.UtcNow + TimeSpan.FromSeconds( seconds ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendLocalizedMessage( 1049532 ); // You play hypnotic music, calming your target.
|
||||
bc.Pacify(from, DateTime.UtcNow + TimeSpan.FromSeconds(seconds));
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendLocalizedMessage(1049532); // You play hypnotic music, calming your target.
|
||||
|
||||
targ.SendLocalizedMessage( 500616 ); // You hear lovely music, and forget to continue battling!
|
||||
targ.Combatant = null;
|
||||
targ.Warmode = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
targ.SendLocalizedMessage(
|
||||
500616); // You hear lovely music, and forget to continue battling!
|
||||
targ.Combatant = null;
|
||||
targ.Warmode = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue