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,290 +1,298 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Server.Network;
|
||||
using Server.Spells;
|
||||
using Server.Targeting;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Server.Items
|
||||
{
|
||||
public class Firebomb : Item
|
||||
{
|
||||
private Timer m_Timer;
|
||||
private int m_Ticks;
|
||||
private Mobile m_LitBy;
|
||||
private List<Mobile> m_Users;
|
||||
public class Firebomb : Item
|
||||
{
|
||||
private Mobile m_LitBy;
|
||||
private int m_Ticks;
|
||||
private Timer m_Timer;
|
||||
private List<Mobile> m_Users;
|
||||
|
||||
[Constructible]
|
||||
public Firebomb() : this( 0x99B )
|
||||
{
|
||||
}
|
||||
[Constructible]
|
||||
public Firebomb() : this(0x99B)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public Firebomb( int itemID ) : base( itemID )
|
||||
{
|
||||
//Name = "a firebomb";
|
||||
Weight = 2.0;
|
||||
Hue = 1260;
|
||||
}
|
||||
[Constructible]
|
||||
public Firebomb(int itemID) : base(itemID)
|
||||
{
|
||||
//Name = "a firebomb";
|
||||
Weight = 2.0;
|
||||
Hue = 1260;
|
||||
}
|
||||
|
||||
public Firebomb( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public Firebomb(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.WriteEncodedInt( (int) 0 ); // version
|
||||
}
|
||||
writer.WriteEncodedInt(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadEncodedInt();
|
||||
}
|
||||
int version = reader.ReadEncodedInt();
|
||||
}
|
||||
|
||||
public override void OnDoubleClick( Mobile from )
|
||||
{
|
||||
if ( !IsChildOf( from.Backpack ) )
|
||||
{
|
||||
from.SendLocalizedMessage( 1042001 ); // That must be in your pack for you to use it.
|
||||
return;
|
||||
}
|
||||
public override void OnDoubleClick(Mobile from)
|
||||
{
|
||||
if (!IsChildOf(from.Backpack))
|
||||
{
|
||||
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
|
||||
return;
|
||||
}
|
||||
|
||||
if ( Core.AOS && (from.Paralyzed || from.Frozen || (from.Spell != null && from.Spell.IsCasting)) )
|
||||
{
|
||||
// to prevent exploiting for pvp
|
||||
from.SendLocalizedMessage( 1075857 ); // You cannot use that while paralyzed.
|
||||
return;
|
||||
}
|
||||
if (Core.AOS && (from.Paralyzed || from.Frozen || from.Spell != null && from.Spell.IsCasting))
|
||||
{
|
||||
// to prevent exploiting for pvp
|
||||
from.SendLocalizedMessage(1075857); // You cannot use that while paralyzed.
|
||||
return;
|
||||
}
|
||||
|
||||
if ( m_Timer == null )
|
||||
{
|
||||
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 1 ), TimeSpan.FromSeconds( 1 ), OnFirebombTimerTick );
|
||||
m_LitBy = from;
|
||||
from.SendLocalizedMessage( 1060582 ); // You light the firebomb. Throw it now!
|
||||
}
|
||||
else
|
||||
from.SendLocalizedMessage( 1060581 ); // You've already lit it! Better throw it now!
|
||||
if (m_Timer == null)
|
||||
{
|
||||
m_Timer = Timer.DelayCall(TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(1), OnFirebombTimerTick);
|
||||
m_LitBy = from;
|
||||
from.SendLocalizedMessage(1060582); // You light the firebomb. Throw it now!
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendLocalizedMessage(1060581); // You've already lit it! Better throw it now!
|
||||
}
|
||||
|
||||
if ( m_Users == null )
|
||||
m_Users = new List<Mobile>();
|
||||
if (m_Users == null)
|
||||
m_Users = new List<Mobile>();
|
||||
|
||||
if ( !m_Users.Contains( from ) )
|
||||
m_Users.Add( from );
|
||||
if (!m_Users.Contains(from))
|
||||
m_Users.Add(from);
|
||||
|
||||
from.Target = new ThrowTarget( this );
|
||||
}
|
||||
from.Target = new ThrowTarget(this);
|
||||
}
|
||||
|
||||
private void OnFirebombTimerTick()
|
||||
{
|
||||
if ( Deleted )
|
||||
{
|
||||
m_Timer.Stop();
|
||||
return;
|
||||
}
|
||||
private void OnFirebombTimerTick()
|
||||
{
|
||||
if (Deleted)
|
||||
{
|
||||
m_Timer.Stop();
|
||||
return;
|
||||
}
|
||||
|
||||
if ( Map == Map.Internal && HeldBy == null )
|
||||
return;
|
||||
if (Map == Map.Internal && HeldBy == null)
|
||||
return;
|
||||
|
||||
switch ( m_Ticks )
|
||||
{
|
||||
case 0:
|
||||
case 1:
|
||||
case 2:
|
||||
{
|
||||
++m_Ticks;
|
||||
switch (m_Ticks)
|
||||
{
|
||||
case 0:
|
||||
case 1:
|
||||
case 2:
|
||||
{
|
||||
++m_Ticks;
|
||||
|
||||
if ( HeldBy != null )
|
||||
HeldBy.PublicOverheadMessage( MessageType.Regular, 957, false, m_Ticks.ToString() );
|
||||
else if ( RootParent == null )
|
||||
PublicOverheadMessage( MessageType.Regular, 957, false, m_Ticks.ToString() );
|
||||
else if ( RootParent is Mobile mobile )
|
||||
mobile.PublicOverheadMessage( MessageType.Regular, 957, false, m_Ticks.ToString() );
|
||||
if (HeldBy != null)
|
||||
HeldBy.PublicOverheadMessage(MessageType.Regular, 957, false, m_Ticks.ToString());
|
||||
else if (RootParent == null)
|
||||
PublicOverheadMessage(MessageType.Regular, 957, false, m_Ticks.ToString());
|
||||
else if (RootParent is Mobile mobile)
|
||||
mobile.PublicOverheadMessage(MessageType.Regular, 957, false, m_Ticks.ToString());
|
||||
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
HeldBy?.DropHolding();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
HeldBy?.DropHolding();
|
||||
|
||||
if ( m_Users != null )
|
||||
{
|
||||
foreach ( Mobile m in m_Users )
|
||||
{
|
||||
if ( m.Target is ThrowTarget targ && targ.Bomb == this )
|
||||
Target.Cancel( m );
|
||||
}
|
||||
if (m_Users != null)
|
||||
{
|
||||
foreach (Mobile m in m_Users)
|
||||
if (m.Target is ThrowTarget targ && targ.Bomb == this)
|
||||
Target.Cancel(m);
|
||||
|
||||
m_Users.Clear();
|
||||
m_Users = null;
|
||||
}
|
||||
m_Users.Clear();
|
||||
m_Users = null;
|
||||
}
|
||||
|
||||
if ( RootParent is Mobile parent )
|
||||
{
|
||||
parent.SendLocalizedMessage( 1060583 ); // The firebomb explodes in your hand!
|
||||
AOS.Damage( parent, Utility.Random( 3 ) + 4, 0, 100, 0, 0, 0 );
|
||||
}
|
||||
else if ( RootParent == null )
|
||||
{
|
||||
List<Mobile> toDamage = new List<Mobile>();
|
||||
IPooledEnumerable<Mobile> eable = Map.GetMobilesInRange( Location, 1 );
|
||||
if (RootParent is Mobile parent)
|
||||
{
|
||||
parent.SendLocalizedMessage(1060583); // The firebomb explodes in your hand!
|
||||
AOS.Damage(parent, Utility.Random(3) + 4, 0, 100, 0, 0, 0);
|
||||
}
|
||||
else if (RootParent == null)
|
||||
{
|
||||
List<Mobile> toDamage = new List<Mobile>();
|
||||
IPooledEnumerable<Mobile> eable = Map.GetMobilesInRange(Location, 1);
|
||||
|
||||
foreach ( Mobile m in eable )
|
||||
toDamage.Add( m );
|
||||
foreach (Mobile m in eable)
|
||||
toDamage.Add(m);
|
||||
|
||||
eable.Free();
|
||||
eable.Free();
|
||||
|
||||
for ( int i = 0; i < toDamage.Count; ++i )
|
||||
{
|
||||
Mobile victim = toDamage[i];
|
||||
for (int i = 0; i < toDamage.Count; ++i)
|
||||
{
|
||||
Mobile victim = toDamage[i];
|
||||
|
||||
if ( m_LitBy == null || (SpellHelper.ValidIndirectTarget( m_LitBy, victim ) && m_LitBy.CanBeHarmful( victim, false )) )
|
||||
{
|
||||
m_LitBy?.DoHarmful( victim );
|
||||
if (m_LitBy == null || SpellHelper.ValidIndirectTarget(m_LitBy, victim) &&
|
||||
m_LitBy.CanBeHarmful(victim, false))
|
||||
{
|
||||
m_LitBy?.DoHarmful(victim);
|
||||
|
||||
AOS.Damage( victim, m_LitBy, Utility.Random( 3 ) + 4, 0, 100, 0, 0, 0 );
|
||||
}
|
||||
}
|
||||
(new FirebombField( m_LitBy, toDamage )).MoveToWorld( Location, Map );
|
||||
}
|
||||
AOS.Damage(victim, m_LitBy, Utility.Random(3) + 4, 0, 100, 0, 0, 0);
|
||||
}
|
||||
}
|
||||
|
||||
m_Timer.Stop();
|
||||
Delete();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
new FirebombField(m_LitBy, toDamage).MoveToWorld(Location, Map);
|
||||
}
|
||||
|
||||
private void OnFirebombTarget( Mobile from, object obj )
|
||||
{
|
||||
if ( Deleted || Map == Map.Internal || !IsChildOf( from.Backpack ) )
|
||||
return;
|
||||
m_Timer.Stop();
|
||||
Delete();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ( !(obj is IPoint3D p) )
|
||||
return;
|
||||
private void OnFirebombTarget(Mobile from, object obj)
|
||||
{
|
||||
if (Deleted || Map == Map.Internal || !IsChildOf(from.Backpack))
|
||||
return;
|
||||
|
||||
SpellHelper.GetSurfaceTop( ref p );
|
||||
if (!(obj is IPoint3D p))
|
||||
return;
|
||||
|
||||
from.RevealingAction();
|
||||
SpellHelper.GetSurfaceTop(ref p);
|
||||
|
||||
IEntity to = p as IEntity ?? new Entity( Serial.Zero, new Point3D( p ), Map );
|
||||
from.RevealingAction();
|
||||
|
||||
Effects.SendMovingEffect( from, to, ItemID, 7, 0, false, false, Hue, 0 );
|
||||
IEntity to = p as IEntity ?? new Entity(Serial.Zero, new Point3D(p), Map);
|
||||
|
||||
Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), new TimerStateCallback( FirebombReposition_OnTick ), new object[]{ p, Map } );
|
||||
Internalize();
|
||||
}
|
||||
Effects.SendMovingEffect(from, to, ItemID, 7, 0, false, false, Hue, 0);
|
||||
|
||||
private void FirebombReposition_OnTick( object state )
|
||||
{
|
||||
if ( Deleted )
|
||||
return;
|
||||
Timer.DelayCall(TimeSpan.FromSeconds(1.0), new TimerStateCallback(FirebombReposition_OnTick),
|
||||
new object[] { p, Map });
|
||||
Internalize();
|
||||
}
|
||||
|
||||
object[] states = (object[])state;
|
||||
IPoint3D p = (IPoint3D)states[0];
|
||||
Map map = (Map)states[1];
|
||||
private void FirebombReposition_OnTick(object state)
|
||||
{
|
||||
if (Deleted)
|
||||
return;
|
||||
|
||||
MoveToWorld( new Point3D( p ), map );
|
||||
}
|
||||
object[] states = (object[])state;
|
||||
IPoint3D p = (IPoint3D)states[0];
|
||||
Map map = (Map)states[1];
|
||||
|
||||
private class ThrowTarget : Target
|
||||
{
|
||||
public Firebomb Bomb { get; }
|
||||
MoveToWorld(new Point3D(p), map);
|
||||
}
|
||||
|
||||
public ThrowTarget( Firebomb bomb )
|
||||
: base( 12, true, TargetFlags.None )
|
||||
{
|
||||
Bomb = bomb;
|
||||
}
|
||||
private class ThrowTarget : Target
|
||||
{
|
||||
public ThrowTarget(Firebomb bomb)
|
||||
: base(12, true, TargetFlags.None)
|
||||
{
|
||||
Bomb = bomb;
|
||||
}
|
||||
|
||||
protected override void OnTarget( Mobile from, object targeted )
|
||||
{
|
||||
Bomb.OnFirebombTarget( from, targeted );
|
||||
}
|
||||
}
|
||||
}
|
||||
public Firebomb Bomb{ get; }
|
||||
|
||||
public class FirebombField : Item
|
||||
{
|
||||
private List<Mobile> m_Burning;
|
||||
private Timer m_Timer;
|
||||
private Mobile m_LitBy;
|
||||
private DateTime m_Expire;
|
||||
protected override void OnTarget(Mobile from, object targeted)
|
||||
{
|
||||
Bomb.OnFirebombTarget(from, targeted);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public FirebombField( Mobile litBy, List<Mobile> toDamage ) : base( 0x376A )
|
||||
{
|
||||
Movable = false;
|
||||
m_LitBy = litBy;
|
||||
m_Expire = DateTime.UtcNow + TimeSpan.FromSeconds( 10 );
|
||||
m_Burning = toDamage;
|
||||
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), TimeSpan.FromSeconds( 1.0 ), OnFirebombFieldTimerTick );
|
||||
}
|
||||
public class FirebombField : Item
|
||||
{
|
||||
private List<Mobile> m_Burning;
|
||||
private DateTime m_Expire;
|
||||
private Mobile m_LitBy;
|
||||
private Timer m_Timer;
|
||||
|
||||
public FirebombField( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public FirebombField(Mobile litBy, List<Mobile> toDamage) : base(0x376A)
|
||||
{
|
||||
Movable = false;
|
||||
m_LitBy = litBy;
|
||||
m_Expire = DateTime.UtcNow + TimeSpan.FromSeconds(10);
|
||||
m_Burning = toDamage;
|
||||
m_Timer = Timer.DelayCall(TimeSpan.FromSeconds(1.0), TimeSpan.FromSeconds(1.0), OnFirebombFieldTimerTick);
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
// Don't serialize these...
|
||||
}
|
||||
public FirebombField(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
}
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
// Don't serialize these...
|
||||
}
|
||||
|
||||
public override bool OnMoveOver( Mobile m )
|
||||
{
|
||||
if ( ItemID == 0x398C && m_LitBy == null || (SpellHelper.ValidIndirectTarget( m_LitBy, m ) && m_LitBy.CanBeHarmful( m, false )) )
|
||||
{
|
||||
m_LitBy?.DoHarmful( m );
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
}
|
||||
|
||||
AOS.Damage( m, m_LitBy, 2, 0, 100, 0, 0, 0 );
|
||||
m.PlaySound( 0x208 );
|
||||
public override bool OnMoveOver(Mobile m)
|
||||
{
|
||||
if (ItemID == 0x398C && m_LitBy == null ||
|
||||
SpellHelper.ValidIndirectTarget(m_LitBy, m) && m_LitBy.CanBeHarmful(m, false))
|
||||
{
|
||||
m_LitBy?.DoHarmful(m);
|
||||
|
||||
if ( !m_Burning.Contains( m ) )
|
||||
m_Burning.Add( m );
|
||||
}
|
||||
AOS.Damage(m, m_LitBy, 2, 0, 100, 0, 0, 0);
|
||||
m.PlaySound(0x208);
|
||||
|
||||
return true;
|
||||
}
|
||||
if (!m_Burning.Contains(m))
|
||||
m_Burning.Add(m);
|
||||
}
|
||||
|
||||
private void OnFirebombFieldTimerTick()
|
||||
{
|
||||
if ( Deleted )
|
||||
{
|
||||
m_Timer.Stop();
|
||||
return;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
if ( ItemID == 0x376A )
|
||||
{
|
||||
ItemID = 0x398C;
|
||||
return;
|
||||
}
|
||||
private void OnFirebombFieldTimerTick()
|
||||
{
|
||||
if (Deleted)
|
||||
{
|
||||
m_Timer.Stop();
|
||||
return;
|
||||
}
|
||||
|
||||
for ( int i = 0; i < m_Burning.Count; )
|
||||
{
|
||||
Mobile victim = m_Burning[i];
|
||||
if (ItemID == 0x376A)
|
||||
{
|
||||
ItemID = 0x398C;
|
||||
return;
|
||||
}
|
||||
|
||||
if ( victim.Location == Location && victim.Map == Map && (m_LitBy == null || ( SpellHelper.ValidIndirectTarget( m_LitBy, victim ) && m_LitBy.CanBeHarmful( victim, false ) )) )
|
||||
{
|
||||
m_LitBy?.DoHarmful( victim );
|
||||
for (int i = 0; i < m_Burning.Count;)
|
||||
{
|
||||
Mobile victim = m_Burning[i];
|
||||
|
||||
AOS.Damage( victim, m_LitBy, Utility.Random( 3 ) + 4, 0, 100, 0, 0, 0 );
|
||||
++i;
|
||||
}
|
||||
else
|
||||
m_Burning.RemoveAt( i );
|
||||
}
|
||||
if (victim.Location == Location && victim.Map == Map &&
|
||||
(m_LitBy == null || SpellHelper.ValidIndirectTarget(m_LitBy, victim) &&
|
||||
m_LitBy.CanBeHarmful(victim, false)))
|
||||
{
|
||||
m_LitBy?.DoHarmful(victim);
|
||||
|
||||
if ( DateTime.UtcNow >= m_Expire )
|
||||
{
|
||||
m_Timer.Stop();
|
||||
Delete();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
AOS.Damage(victim, m_LitBy, Utility.Random(3) + 4, 0, 100, 0, 0, 0);
|
||||
++i;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_Burning.RemoveAt(i);
|
||||
}
|
||||
}
|
||||
|
||||
if (DateTime.UtcNow >= m_Expire)
|
||||
{
|
||||
m_Timer.Stop();
|
||||
Delete();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue