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
|
|
@ -4,264 +4,261 @@ using Server.Network;
|
|||
|
||||
namespace Server.Factions
|
||||
{
|
||||
public enum AllowedPlacing
|
||||
{
|
||||
Everywhere,
|
||||
public enum AllowedPlacing
|
||||
{
|
||||
Everywhere,
|
||||
|
||||
AnyFactionTown,
|
||||
ControlledFactionTown,
|
||||
FactionStronghold
|
||||
}
|
||||
AnyFactionTown,
|
||||
ControlledFactionTown,
|
||||
FactionStronghold
|
||||
}
|
||||
|
||||
public abstract class BaseFactionTrap : BaseTrap
|
||||
{
|
||||
private Timer m_Concealing;
|
||||
public abstract class BaseFactionTrap : BaseTrap
|
||||
{
|
||||
private Timer m_Concealing;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Faction Faction { get; set; }
|
||||
public BaseFactionTrap(Faction f, Mobile m, int itemID) : base(itemID)
|
||||
{
|
||||
Visible = false;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Mobile Placer { get; set; }
|
||||
Faction = f;
|
||||
TimeOfPlacement = DateTime.UtcNow;
|
||||
Placer = m;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public DateTime TimeOfPlacement { get; set; }
|
||||
public BaseFactionTrap(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual int EffectSound => 0;
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public Faction Faction{ get; set; }
|
||||
|
||||
public virtual int SilverFromDisarm => 100;
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public Mobile Placer{ get; set; }
|
||||
|
||||
public virtual int MessageHue => 0;
|
||||
|
||||
public virtual int AttackMessage => 0;
|
||||
public virtual int DisarmMessage => 0;
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public DateTime TimeOfPlacement{ get; set; }
|
||||
|
||||
public virtual AllowedPlacing AllowedPlacing => AllowedPlacing.Everywhere;
|
||||
public virtual int EffectSound => 0;
|
||||
|
||||
public virtual TimeSpan ConcealPeriod => TimeSpan.FromMinutes( 1.0 );
|
||||
public virtual int SilverFromDisarm => 100;
|
||||
|
||||
public virtual TimeSpan DecayPeriod
|
||||
{
|
||||
get
|
||||
{
|
||||
if ( Core.AOS )
|
||||
return TimeSpan.FromDays( 1.0 );
|
||||
public virtual int MessageHue => 0;
|
||||
|
||||
return TimeSpan.MaxValue; // no decay
|
||||
}
|
||||
}
|
||||
public virtual int AttackMessage => 0;
|
||||
public virtual int DisarmMessage => 0;
|
||||
|
||||
public override void OnTrigger( Mobile from )
|
||||
{
|
||||
if ( !IsEnemy( from ) )
|
||||
return;
|
||||
public virtual AllowedPlacing AllowedPlacing => AllowedPlacing.Everywhere;
|
||||
|
||||
Conceal();
|
||||
|
||||
DoVisibleEffect();
|
||||
Effects.PlaySound( Location, Map, EffectSound );
|
||||
DoAttackEffect( from );
|
||||
public virtual TimeSpan ConcealPeriod => TimeSpan.FromMinutes(1.0);
|
||||
|
||||
int silverToAward = ( from.Alive ? 20 : 40 );
|
||||
public virtual TimeSpan DecayPeriod
|
||||
{
|
||||
get
|
||||
{
|
||||
if (Core.AOS)
|
||||
return TimeSpan.FromDays(1.0);
|
||||
|
||||
if ( silverToAward > 0 && Placer != null && Faction != null )
|
||||
{
|
||||
PlayerState victimState = PlayerState.Find( from );
|
||||
return TimeSpan.MaxValue; // no decay
|
||||
}
|
||||
}
|
||||
|
||||
if ( victimState != null && victimState.CanGiveSilverTo( Placer ) && victimState.KillPoints > 0 )
|
||||
{
|
||||
int silverGiven = Faction.AwardSilver( Placer, silverToAward );
|
||||
public override void OnTrigger(Mobile from)
|
||||
{
|
||||
if (!IsEnemy(from))
|
||||
return;
|
||||
|
||||
if ( silverGiven > 0 )
|
||||
{
|
||||
// TODO: Get real message
|
||||
if ( from.Alive )
|
||||
Placer.SendMessage( "You have earned {0} silver pieces because {1} fell for your trap.", silverGiven, from.Name );
|
||||
else
|
||||
Placer.SendLocalizedMessage( 1042736, $"{silverGiven} silver\t{from.Name}"); // You have earned ~1_SILVER_AMOUNT~ pieces for vanquishing ~2_PLAYER_NAME~!
|
||||
}
|
||||
|
||||
victimState.OnGivenSilverTo( Placer );
|
||||
}
|
||||
}
|
||||
|
||||
from.LocalOverheadMessage( MessageType.Regular, MessageHue, AttackMessage );
|
||||
}
|
||||
Conceal();
|
||||
|
||||
public abstract void DoVisibleEffect();
|
||||
public abstract void DoAttackEffect( Mobile m );
|
||||
DoVisibleEffect();
|
||||
Effects.PlaySound(Location, Map, EffectSound);
|
||||
DoAttackEffect(from);
|
||||
|
||||
public virtual int IsValidLocation()
|
||||
{
|
||||
return IsValidLocation( GetWorldLocation(), Map );
|
||||
}
|
||||
int silverToAward = from.Alive ? 20 : 40;
|
||||
|
||||
public virtual int IsValidLocation( Point3D p, Map m )
|
||||
{
|
||||
if ( m == null )
|
||||
return 502956; // You cannot place a trap on that.
|
||||
|
||||
if ( Core.ML )
|
||||
{
|
||||
foreach( Item item in m.GetItemsInRange( p, 0 ) )
|
||||
{
|
||||
if ( item is BaseFactionTrap trap && trap.Faction == Faction )
|
||||
return 1075263; // There is already a trap belonging to your faction at this location.;
|
||||
}
|
||||
}
|
||||
if (silverToAward > 0 && Placer != null && Faction != null)
|
||||
{
|
||||
PlayerState victimState = PlayerState.Find(from);
|
||||
|
||||
switch( AllowedPlacing )
|
||||
{
|
||||
case AllowedPlacing.FactionStronghold:
|
||||
{
|
||||
StrongholdRegion region = (StrongholdRegion) Region.Find( p, m ).GetRegion( typeof( StrongholdRegion ) );
|
||||
if (victimState != null && victimState.CanGiveSilverTo(Placer) && victimState.KillPoints > 0)
|
||||
{
|
||||
int silverGiven = Faction.AwardSilver(Placer, silverToAward);
|
||||
|
||||
if ( region != null && region.Faction == Faction )
|
||||
return 0;
|
||||
if (silverGiven > 0)
|
||||
{
|
||||
// TODO: Get real message
|
||||
if (from.Alive)
|
||||
Placer.SendMessage("You have earned {0} silver pieces because {1} fell for your trap.",
|
||||
silverGiven, from.Name);
|
||||
else
|
||||
Placer.SendLocalizedMessage(1042736,
|
||||
$"{silverGiven} silver\t{from.Name}"); // You have earned ~1_SILVER_AMOUNT~ pieces for vanquishing ~2_PLAYER_NAME~!
|
||||
}
|
||||
|
||||
return 1010355; // This trap can only be placed in your stronghold
|
||||
}
|
||||
case AllowedPlacing.AnyFactionTown:
|
||||
{
|
||||
Town town = Town.FromRegion( Region.Find( p, m ) );
|
||||
victimState.OnGivenSilverTo(Placer);
|
||||
}
|
||||
}
|
||||
|
||||
if ( town != null )
|
||||
return 0;
|
||||
from.LocalOverheadMessage(MessageType.Regular, MessageHue, AttackMessage);
|
||||
}
|
||||
|
||||
return 1010356; // This trap can only be placed in a faction town
|
||||
}
|
||||
case AllowedPlacing.ControlledFactionTown:
|
||||
{
|
||||
Town town = Town.FromRegion( Region.Find( p, m ) );
|
||||
|
||||
if ( town != null && town.Owner == Faction )
|
||||
return 0;
|
||||
|
||||
return 1010357; // This trap can only be placed in a town your faction controls
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
public override void OnMovement( Mobile m, Point3D oldLocation )
|
||||
{
|
||||
base.OnMovement( m, oldLocation );
|
||||
|
||||
if ( !CheckDecay() && CheckRange( m.Location, oldLocation, 6 ) )
|
||||
{
|
||||
if ( Faction.Find( m ) != null && ((m.Skills[SkillName.DetectHidden].Value - 80.0) / 20.0) > Utility.RandomDouble() )
|
||||
PrivateOverheadLocalizedMessage( m, 1010154, MessageHue, "", "" ); // [Faction Trap]
|
||||
}
|
||||
}
|
||||
public abstract void DoVisibleEffect();
|
||||
public abstract void DoAttackEffect(Mobile m);
|
||||
|
||||
public void PrivateOverheadLocalizedMessage( Mobile to, int number, int hue, string name, string args )
|
||||
{
|
||||
NetState ns = to?.NetState;
|
||||
public virtual int IsValidLocation()
|
||||
{
|
||||
return IsValidLocation(GetWorldLocation(), Map);
|
||||
}
|
||||
|
||||
ns?.Send( new MessageLocalized( Serial, ItemID, MessageType.Regular, hue, 3, number, name, args ) );
|
||||
}
|
||||
public virtual int IsValidLocation(Point3D p, Map m)
|
||||
{
|
||||
if (m == null)
|
||||
return 502956; // You cannot place a trap on that.
|
||||
|
||||
public BaseFactionTrap( Faction f, Mobile m, int itemID ) : base( itemID )
|
||||
{
|
||||
Visible = false;
|
||||
|
||||
Faction = f;
|
||||
TimeOfPlacement = DateTime.UtcNow;
|
||||
Placer = m;
|
||||
}
|
||||
|
||||
public BaseFactionTrap( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
|
||||
public virtual bool CheckDecay()
|
||||
{
|
||||
TimeSpan decayPeriod = DecayPeriod;
|
||||
if (Core.ML)
|
||||
foreach (Item item in m.GetItemsInRange(p, 0))
|
||||
if (item is BaseFactionTrap trap && trap.Faction == Faction)
|
||||
return 1075263; // There is already a trap belonging to your faction at this location.;
|
||||
|
||||
if ( decayPeriod == TimeSpan.MaxValue )
|
||||
return false;
|
||||
switch (AllowedPlacing)
|
||||
{
|
||||
case AllowedPlacing.FactionStronghold:
|
||||
{
|
||||
StrongholdRegion region = (StrongholdRegion)Region.Find(p, m).GetRegion(typeof(StrongholdRegion));
|
||||
|
||||
if ( (TimeOfPlacement + decayPeriod) < DateTime.UtcNow )
|
||||
{
|
||||
Timer.DelayCall( TimeSpan.Zero, Delete );
|
||||
return true;
|
||||
}
|
||||
if (region != null && region.Faction == Faction)
|
||||
return 0;
|
||||
|
||||
return false;
|
||||
}
|
||||
return 1010355; // This trap can only be placed in your stronghold
|
||||
}
|
||||
case AllowedPlacing.AnyFactionTown:
|
||||
{
|
||||
Town town = Town.FromRegion(Region.Find(p, m));
|
||||
|
||||
public virtual void BeginConceal()
|
||||
{
|
||||
m_Concealing?.Stop();
|
||||
if (town != null)
|
||||
return 0;
|
||||
|
||||
m_Concealing = Timer.DelayCall( ConcealPeriod, Conceal );
|
||||
}
|
||||
return 1010356; // This trap can only be placed in a faction town
|
||||
}
|
||||
case AllowedPlacing.ControlledFactionTown:
|
||||
{
|
||||
Town town = Town.FromRegion(Region.Find(p, m));
|
||||
|
||||
public virtual void Conceal()
|
||||
{
|
||||
m_Concealing?.Stop();
|
||||
if (town != null && town.Owner == Faction)
|
||||
return 0;
|
||||
|
||||
m_Concealing = null;
|
||||
return 1010357; // This trap can only be placed in a town your faction controls
|
||||
}
|
||||
}
|
||||
|
||||
if ( !Deleted )
|
||||
Visible = false;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void OnMovement(Mobile m, Point3D oldLocation)
|
||||
{
|
||||
base.OnMovement(m, oldLocation);
|
||||
|
||||
writer.Write( (int) 0 ); // version
|
||||
if (!CheckDecay() && CheckRange(m.Location, oldLocation, 6))
|
||||
if (Faction.Find(m) != null &&
|
||||
(m.Skills[SkillName.DetectHidden].Value - 80.0) / 20.0 > Utility.RandomDouble())
|
||||
PrivateOverheadLocalizedMessage(m, 1010154, MessageHue, "", ""); // [Faction Trap]
|
||||
}
|
||||
|
||||
Faction.WriteReference( writer, Faction );
|
||||
writer.Write( (Mobile) Placer );
|
||||
writer.Write( (DateTime) TimeOfPlacement );
|
||||
public void PrivateOverheadLocalizedMessage(Mobile to, int number, int hue, string name, string args)
|
||||
{
|
||||
NetState ns = to?.NetState;
|
||||
|
||||
if ( Visible )
|
||||
BeginConceal();
|
||||
}
|
||||
ns?.Send(new MessageLocalized(Serial, ItemID, MessageType.Regular, hue, 3, number, name, args));
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
public virtual bool CheckDecay()
|
||||
{
|
||||
TimeSpan decayPeriod = DecayPeriod;
|
||||
|
||||
int version = reader.ReadInt();
|
||||
if (decayPeriod == TimeSpan.MaxValue)
|
||||
return false;
|
||||
|
||||
Faction = Faction.ReadReference( reader );
|
||||
Placer = reader.ReadMobile();
|
||||
TimeOfPlacement = reader.ReadDateTime();
|
||||
if (TimeOfPlacement + decayPeriod < DateTime.UtcNow)
|
||||
{
|
||||
Timer.DelayCall(TimeSpan.Zero, Delete);
|
||||
return true;
|
||||
}
|
||||
|
||||
if ( Visible )
|
||||
BeginConceal();
|
||||
return false;
|
||||
}
|
||||
|
||||
CheckDecay();
|
||||
}
|
||||
public virtual void BeginConceal()
|
||||
{
|
||||
m_Concealing?.Stop();
|
||||
|
||||
public override void OnDelete()
|
||||
{
|
||||
if ( Faction != null && Faction.Traps.Contains( this ) )
|
||||
Faction.Traps.Remove( this );
|
||||
m_Concealing = Timer.DelayCall(ConcealPeriod, Conceal);
|
||||
}
|
||||
|
||||
base.OnDelete();
|
||||
}
|
||||
public virtual void Conceal()
|
||||
{
|
||||
m_Concealing?.Stop();
|
||||
|
||||
public virtual bool IsEnemy( Mobile mob )
|
||||
{
|
||||
if ( mob.Hidden && mob.AccessLevel > AccessLevel.Player )
|
||||
return false;
|
||||
m_Concealing = null;
|
||||
|
||||
if ( !mob.Alive || mob.IsDeadBondedPet )
|
||||
return false;
|
||||
if (!Deleted)
|
||||
Visible = false;
|
||||
}
|
||||
|
||||
Faction faction = Faction.Find( mob, true );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
if ( faction == null && mob is BaseFactionGuard guard )
|
||||
faction = guard.Faction;
|
||||
writer.Write(0); // version
|
||||
|
||||
if ( faction == null )
|
||||
return false;
|
||||
Faction.WriteReference(writer, Faction);
|
||||
writer.Write(Placer);
|
||||
writer.Write(TimeOfPlacement);
|
||||
|
||||
return ( faction != Faction );
|
||||
}
|
||||
}
|
||||
}
|
||||
if (Visible)
|
||||
BeginConceal();
|
||||
}
|
||||
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
|
||||
Faction = Faction.ReadReference(reader);
|
||||
Placer = reader.ReadMobile();
|
||||
TimeOfPlacement = reader.ReadDateTime();
|
||||
|
||||
if (Visible)
|
||||
BeginConceal();
|
||||
|
||||
CheckDecay();
|
||||
}
|
||||
|
||||
public override void OnDelete()
|
||||
{
|
||||
if (Faction != null && Faction.Traps.Contains(this))
|
||||
Faction.Traps.Remove(this);
|
||||
|
||||
base.OnDelete();
|
||||
}
|
||||
|
||||
public virtual bool IsEnemy(Mobile mob)
|
||||
{
|
||||
if (mob.Hidden && mob.AccessLevel > AccessLevel.Player)
|
||||
return false;
|
||||
|
||||
if (!mob.Alive || mob.IsDeadBondedPet)
|
||||
return false;
|
||||
|
||||
Faction faction = Faction.Find(mob, true);
|
||||
|
||||
if (faction == null && mob is BaseFactionGuard guard)
|
||||
faction = guard.Faction;
|
||||
|
||||
if (faction == null)
|
||||
return false;
|
||||
|
||||
return faction != Faction;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue