Fixes code according to modern code style. Fixes a few expression bugs.

This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions

View file

@ -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;
}
}
}

View file

@ -1,109 +1,123 @@
using System;
using Server.Items;
using Server.Engines.Craft;
using Server.Items;
namespace Server.Factions
{
public abstract class BaseFactionTrapDeed : Item, ICraftable
{
public abstract Type TrapType{ get; }
public abstract class BaseFactionTrapDeed : Item, ICraftable
{
private Faction m_Faction;
private Faction m_Faction;
public BaseFactionTrapDeed(int itemID) : base(itemID)
{
Weight = 1.0;
LootType = LootType.Blessed;
}
[CommandProperty( AccessLevel.GameMaster )]
public Faction Faction
{
get => m_Faction;
set
{
m_Faction = value;
public BaseFactionTrapDeed(bool createdFromDeed) : this(0x14F0)
{
}
if ( m_Faction != null )
Hue = m_Faction.Definition.HuePrimary;
}
}
public BaseFactionTrapDeed(Serial serial) : base(serial)
{
}
public BaseFactionTrapDeed( int itemID ) : base( itemID )
{
Weight = 1.0;
LootType = LootType.Blessed;
}
public abstract Type TrapType{ get; }
public BaseFactionTrapDeed( bool createdFromDeed ) : this( 0x14F0 )
{
}
[CommandProperty(AccessLevel.GameMaster)]
public Faction Faction
{
get => m_Faction;
set
{
m_Faction = value;
public BaseFactionTrapDeed( Serial serial ) : base( serial )
{
}
if (m_Faction != null)
Hue = m_Faction.Definition.HuePrimary;
}
}
public virtual BaseFactionTrap Construct( Mobile from )
{
try{ return Activator.CreateInstance( TrapType, new object[]{ m_Faction, from } ) as BaseFactionTrap; }
catch{ return null; }
}
#region ICraftable Members
public override void OnDoubleClick( Mobile from )
{
Faction faction = Faction.Find( from );
public int OnCraft(int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool,
CraftItem craftItem, int resHue)
{
ItemID = 0x14F0;
Faction = Faction.Find(from);
if ( faction == null )
from.SendLocalizedMessage( 1010353, "", 0x23 ); // Only faction members may place faction traps
else if ( faction != m_Faction )
from.SendLocalizedMessage( 1010354, "", 0x23 ); // You may only place faction traps created by your faction
else if ( faction.Traps.Count >= faction.MaximumTraps )
from.SendLocalizedMessage( 1010358, "", 0x23 ); // Your faction already has the maximum number of traps placed
else
{
BaseFactionTrap trap = Construct( from );
return 1;
}
if ( trap == null )
return;
#endregion
int message = trap.IsValidLocation( from.Location, from.Map );
public virtual BaseFactionTrap Construct(Mobile from)
{
try
{
return Activator.CreateInstance(TrapType, m_Faction, from) as BaseFactionTrap;
}
catch
{
return null;
}
}
if ( message > 0 )
{
from.SendLocalizedMessage( message, "", 0x23 );
trap.Delete();
}
else
{
from.SendLocalizedMessage( 1010360 ); // You arm the trap and carefully hide it from view
trap.MoveToWorld( from.Location, from.Map );
faction.Traps.Add( trap );
Delete();
}
}
}
public override void OnDoubleClick(Mobile from)
{
Faction faction = Faction.Find(from);
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
if (faction == null)
{
from.SendLocalizedMessage(1010353, "", 0x23); // Only faction members may place faction traps
}
else if (faction != m_Faction)
{
from.SendLocalizedMessage(1010354, "", 0x23); // You may only place faction traps created by your faction
}
else if (faction.Traps.Count >= faction.MaximumTraps)
{
from.SendLocalizedMessage(1010358, "", 0x23); // Your faction already has the maximum number of traps placed
}
else
{
BaseFactionTrap trap = Construct(from);
writer.Write( (int) 0 ); // version
if (trap == null)
return;
Faction.WriteReference( writer, m_Faction );
}
int message = trap.IsValidLocation(from.Location, from.Map);
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
if (message > 0)
{
from.SendLocalizedMessage(message, "", 0x23);
trap.Delete();
}
else
{
from.SendLocalizedMessage(1010360); // You arm the trap and carefully hide it from view
trap.MoveToWorld(from.Location, from.Map);
faction.Traps.Add(trap);
Delete();
}
}
}
int version = reader.ReadInt();
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
m_Faction = Faction.ReadReference( reader );
}
#region ICraftable Members
writer.Write(0); // version
public int OnCraft( int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool, CraftItem craftItem, int resHue )
{
ItemID = 0x14F0;
Faction = Faction.Find( from );
Faction.WriteReference(writer, m_Faction);
}
return 1;
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
#endregion
}
}
int version = reader.ReadInt();
m_Faction = Faction.ReadReference(reader);
}
}
}

View file

@ -2,83 +2,83 @@ using System;
namespace Server.Factions
{
public class FactionExplosionTrap : BaseFactionTrap
{
public override int LabelNumber => 1044599; // faction explosion trap
public class FactionExplosionTrap : BaseFactionTrap
{
[Constructible]
public FactionExplosionTrap() : this(null)
{
}
public override int AttackMessage => 1010543; // You are enveloped in an explosion of fire!
public override int DisarmMessage => 1010539; // You carefully remove the pressure trigger and disable the trap.
public override int EffectSound => 0x307;
public override int MessageHue => 0x78;
public FactionExplosionTrap(Faction f) : this(f, null)
{
}
public override AllowedPlacing AllowedPlacing => AllowedPlacing.AnyFactionTown;
public FactionExplosionTrap(Faction f, Mobile m) : base(f, m, 0x11C1)
{
}
public override void DoVisibleEffect()
{
Effects.SendLocationEffect( GetWorldLocation(), Map, 0x36BD, 15, 10 );
}
public FactionExplosionTrap(Serial serial) : base(serial)
{
}
public override void DoAttackEffect( Mobile m )
{
m.Damage( Utility.Dice( 6, 10, 40 ), m );
}
public override int LabelNumber => 1044599; // faction explosion trap
[Constructible]
public FactionExplosionTrap() : this( null )
{
}
public override int AttackMessage => 1010543; // You are enveloped in an explosion of fire!
public override int DisarmMessage => 1010539; // You carefully remove the pressure trigger and disable the trap.
public override int EffectSound => 0x307;
public override int MessageHue => 0x78;
public FactionExplosionTrap( Faction f ) : this( f, null )
{
}
public override AllowedPlacing AllowedPlacing => AllowedPlacing.AnyFactionTown;
public FactionExplosionTrap( Faction f, Mobile m ) : base( f, m, 0x11C1 )
{
}
public override void DoVisibleEffect()
{
Effects.SendLocationEffect(GetWorldLocation(), Map, 0x36BD, 15, 10);
}
public FactionExplosionTrap( Serial serial ) : base( serial )
{
}
public override void DoAttackEffect(Mobile m)
{
m.Damage(Utility.Dice(6, 10, 40), m);
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
int version = reader.ReadInt();
}
}
public class FactionExplosionTrapDeed : BaseFactionTrapDeed
{
public override Type TrapType => typeof( FactionExplosionTrap );
public override int LabelNumber => 1044603; // faction explosion trap deed
public class FactionExplosionTrapDeed : BaseFactionTrapDeed
{
public FactionExplosionTrapDeed() : base(0x36D2)
{
}
public FactionExplosionTrapDeed() : base( 0x36D2 )
{
}
public FactionExplosionTrapDeed(Serial serial) : base(serial)
{
}
public FactionExplosionTrapDeed( Serial serial ) : base( serial )
{
}
public override Type TrapType => typeof(FactionExplosionTrap);
public override int LabelNumber => 1044603; // faction explosion trap deed
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}

View file

@ -2,83 +2,83 @@ using System;
namespace Server.Factions
{
public class FactionGasTrap : BaseFactionTrap
{
public override int LabelNumber => 1044598; // faction gas trap
public class FactionGasTrap : BaseFactionTrap
{
[Constructible]
public FactionGasTrap() : this(null)
{
}
public override int AttackMessage => 1010542; // A noxious green cloud of poison gas envelops you!
public override int DisarmMessage => 502376; // The poison leaks harmlessly away due to your deft touch.
public override int EffectSound => 0x230;
public override int MessageHue => 0x44;
public FactionGasTrap(Faction f) : this(f, null)
{
}
public override AllowedPlacing AllowedPlacing => AllowedPlacing.FactionStronghold;
public FactionGasTrap(Faction f, Mobile m) : base(f, m, 0x113C)
{
}
public override void DoVisibleEffect()
{
Effects.SendLocationEffect( Location, Map, 0x3709, 28, 10, 0x1D3, 5 );
}
public FactionGasTrap(Serial serial) : base(serial)
{
}
public override void DoAttackEffect( Mobile m )
{
m.ApplyPoison( m, Poison.Lethal );
}
public override int LabelNumber => 1044598; // faction gas trap
[Constructible]
public FactionGasTrap() : this( null )
{
}
public override int AttackMessage => 1010542; // A noxious green cloud of poison gas envelops you!
public override int DisarmMessage => 502376; // The poison leaks harmlessly away due to your deft touch.
public override int EffectSound => 0x230;
public override int MessageHue => 0x44;
public FactionGasTrap( Faction f ) : this( f, null )
{
}
public override AllowedPlacing AllowedPlacing => AllowedPlacing.FactionStronghold;
public FactionGasTrap( Faction f, Mobile m ) : base( f, m, 0x113C )
{
}
public override void DoVisibleEffect()
{
Effects.SendLocationEffect(Location, Map, 0x3709, 28, 10, 0x1D3, 5);
}
public FactionGasTrap( Serial serial ) : base( serial )
{
}
public override void DoAttackEffect(Mobile m)
{
m.ApplyPoison(m, Poison.Lethal);
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
int version = reader.ReadInt();
}
}
public class FactionGasTrapDeed : BaseFactionTrapDeed
{
public override Type TrapType => typeof( FactionGasTrap );
public override int LabelNumber => 1044602; // faction gas trap deed
public class FactionGasTrapDeed : BaseFactionTrapDeed
{
public FactionGasTrapDeed() : base(0x11AB)
{
}
public FactionGasTrapDeed() : base( 0x11AB )
{
}
public FactionGasTrapDeed(Serial serial) : base(serial)
{
}
public FactionGasTrapDeed( Serial serial ) : base( serial )
{
}
public override Type TrapType => typeof(FactionGasTrap);
public override int LabelNumber => 1044602; // faction gas trap deed
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}

View file

@ -2,83 +2,83 @@ using System;
namespace Server.Factions
{
public class FactionSawTrap : BaseFactionTrap
{
public override int LabelNumber => 1041047; // faction saw trap
public class FactionSawTrap : BaseFactionTrap
{
[Constructible]
public FactionSawTrap() : this(null)
{
}
public override int AttackMessage => 1010544; // The blade cuts deep into your skin!
public override int DisarmMessage => 1010540; // You carefully dismantle the saw mechanism and disable the trap.
public override int EffectSound => 0x218;
public override int MessageHue => 0x5A;
public FactionSawTrap(Serial serial) : base(serial)
{
}
public override AllowedPlacing AllowedPlacing => AllowedPlacing.ControlledFactionTown;
public FactionSawTrap(Faction f) : this(f, null)
{
}
public override void DoVisibleEffect()
{
Effects.SendLocationEffect( Location, Map, 0x11AD, 25, 10 );
}
public FactionSawTrap(Faction f, Mobile m) : base(f, m, 0x11AC)
{
}
public override void DoAttackEffect( Mobile m )
{
m.Damage( Utility.Dice( 6, 10, 40 ), m );
}
public override int LabelNumber => 1041047; // faction saw trap
[Constructible]
public FactionSawTrap() : this( null )
{
}
public override int AttackMessage => 1010544; // The blade cuts deep into your skin!
public override int DisarmMessage => 1010540; // You carefully dismantle the saw mechanism and disable the trap.
public override int EffectSound => 0x218;
public override int MessageHue => 0x5A;
public FactionSawTrap( Serial serial ) : base( serial )
{
}
public override AllowedPlacing AllowedPlacing => AllowedPlacing.ControlledFactionTown;
public FactionSawTrap( Faction f ) : this( f, null )
{
}
public override void DoVisibleEffect()
{
Effects.SendLocationEffect(Location, Map, 0x11AD, 25, 10);
}
public FactionSawTrap( Faction f, Mobile m ) : base( f, m, 0x11AC )
{
}
public override void DoAttackEffect(Mobile m)
{
m.Damage(Utility.Dice(6, 10, 40), m);
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
int version = reader.ReadInt();
}
}
public class FactionSawTrapDeed : BaseFactionTrapDeed
{
public override Type TrapType => typeof( FactionSawTrap );
public override int LabelNumber => 1044604; // faction saw trap deed
public class FactionSawTrapDeed : BaseFactionTrapDeed
{
public FactionSawTrapDeed() : base(0x1107)
{
}
public FactionSawTrapDeed() : base( 0x1107 )
{
}
public FactionSawTrapDeed(Serial serial) : base(serial)
{
}
public FactionSawTrapDeed( Serial serial ) : base( serial )
{
}
public override Type TrapType => typeof(FactionSawTrap);
public override int LabelNumber => 1044604; // faction saw trap deed
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}

View file

@ -2,83 +2,86 @@ using System;
namespace Server.Factions
{
public class FactionSpikeTrap : BaseFactionTrap
{
public override int LabelNumber => 1044601; // faction spike trap
public class FactionSpikeTrap : BaseFactionTrap
{
[Constructible]
public FactionSpikeTrap() : this(null)
{
}
public override int AttackMessage => 1010545; // Large spikes in the ground spring up piercing your skin!
public override int DisarmMessage => 1010541; // You carefully dismantle the trigger on the spikes and disable the trap.
public override int EffectSound => 0x22E;
public override int MessageHue => 0x5A;
public FactionSpikeTrap(Faction f) : this(f, null)
{
}
public override AllowedPlacing AllowedPlacing => AllowedPlacing.ControlledFactionTown;
public FactionSpikeTrap(Faction f, Mobile m) : base(f, m, 0x11A0)
{
}
public override void DoVisibleEffect()
{
Effects.SendLocationEffect( Location, Map, 0x11A4, 12, 6 );
}
public FactionSpikeTrap(Serial serial) : base(serial)
{
}
public override void DoAttackEffect( Mobile m )
{
m.Damage( Utility.Dice( 6, 10, 40 ), m );
}
public override int LabelNumber => 1044601; // faction spike trap
[Constructible]
public FactionSpikeTrap() : this( null )
{
}
public override int AttackMessage => 1010545; // Large spikes in the ground spring up piercing your skin!
public FactionSpikeTrap( Faction f ) : this( f, null )
{
}
public override int DisarmMessage =>
1010541; // You carefully dismantle the trigger on the spikes and disable the trap.
public FactionSpikeTrap( Faction f, Mobile m ) : base( f, m, 0x11A0 )
{
}
public override int EffectSound => 0x22E;
public override int MessageHue => 0x5A;
public FactionSpikeTrap( Serial serial ) : base( serial )
{
}
public override AllowedPlacing AllowedPlacing => AllowedPlacing.ControlledFactionTown;
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void DoVisibleEffect()
{
Effects.SendLocationEffect(Location, Map, 0x11A4, 12, 6);
}
writer.Write( (int) 0 ); // version
}
public override void DoAttackEffect(Mobile m)
{
m.Damage(Utility.Dice(6, 10, 40), m);
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
int version = reader.ReadInt();
}
}
writer.Write(0); // version
}
public class FactionSpikeTrapDeed : BaseFactionTrapDeed
{
public override Type TrapType => typeof( FactionSpikeTrap );
public override int LabelNumber => 1044605; // faction spike trap deed
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
public FactionSpikeTrapDeed() : base( 0x11A5 )
{
}
int version = reader.ReadInt();
}
}
public FactionSpikeTrapDeed( Serial serial ) : base( serial )
{
}
public class FactionSpikeTrapDeed : BaseFactionTrapDeed
{
public FactionSpikeTrapDeed() : base(0x11A5)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public FactionSpikeTrapDeed(Serial serial) : base(serial)
{
}
writer.Write( (int) 0 ); // version
}
public override Type TrapType => typeof(FactionSpikeTrap);
public override int LabelNumber => 1044605; // faction spike trap deed
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}

View file

@ -1,71 +1,71 @@
namespace Server.Factions
{
public class FactionTrapRemovalKit : Item
{
[CommandProperty( AccessLevel.GameMaster )]
public int Charges { get; set; }
public class FactionTrapRemovalKit : Item
{
[Constructible]
public FactionTrapRemovalKit() : base(7867)
{
LootType = LootType.Blessed;
Charges = 25;
}
public override int LabelNumber => 1041508; // a faction trap removal kit
public FactionTrapRemovalKit(Serial serial) : base(serial)
{
}
[Constructible]
public FactionTrapRemovalKit() : base( 7867 )
{
LootType = LootType.Blessed;
Charges = 25;
}
[CommandProperty(AccessLevel.GameMaster)]
public int Charges{ get; set; }
public void ConsumeCharge( Mobile consumer )
{
--Charges;
public override int LabelNumber => 1041508; // a faction trap removal kit
if ( Charges <= 0 )
{
Delete();
public void ConsumeCharge(Mobile consumer)
{
--Charges;
consumer?.SendLocalizedMessage( 1042531 ); // You have used all of the parts in your trap removal kit.
}
}
if (Charges <= 0)
{
Delete();
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
consumer?.SendLocalizedMessage(1042531); // You have used all of the parts in your trap removal kit.
}
}
// NOTE: OSI does not list uses remaining; intentional difference
list.Add( 1060584, Charges.ToString() ); // uses remaining: ~1_val~
}
public override void GetProperties(ObjectPropertyList list)
{
base.GetProperties(list);
public FactionTrapRemovalKit( Serial serial ) : base( serial )
{
}
// NOTE: OSI does not list uses remaining; intentional difference
list.Add(1060584, Charges.ToString()); // uses remaining: ~1_val~
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 1 ); // version
writer.Write(1); // version
writer.WriteEncodedInt( (int) Charges );
}
writer.WriteEncodedInt(Charges);
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
int version = reader.ReadInt();
switch ( version )
{
case 1:
{
Charges = reader.ReadEncodedInt();
break;
}
case 0:
{
Charges = 25;
break;
}
}
}
}
}
switch (version)
{
case 1:
{
Charges = reader.ReadEncodedInt();
break;
}
case 0:
{
Charges = 25;
break;
}
}
}
}
}