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,253 +1,308 @@
|
|||
using System;
|
||||
using System.Collections;
|
||||
using Server.Network;
|
||||
using Server.Targeting;
|
||||
using Server.Spells;
|
||||
using Server.Targeting;
|
||||
|
||||
namespace Server.Items
|
||||
{
|
||||
public enum WandEffect
|
||||
{
|
||||
Clumsiness,
|
||||
Identification,
|
||||
Healing,
|
||||
Feeblemindedness,
|
||||
Weakness,
|
||||
MagicArrow,
|
||||
Harming,
|
||||
Fireball,
|
||||
GreaterHealing,
|
||||
Lightning,
|
||||
ManaDraining
|
||||
}
|
||||
public enum WandEffect
|
||||
{
|
||||
Clumsiness,
|
||||
Identification,
|
||||
Healing,
|
||||
Feeblemindedness,
|
||||
Weakness,
|
||||
MagicArrow,
|
||||
Harming,
|
||||
Fireball,
|
||||
GreaterHealing,
|
||||
Lightning,
|
||||
ManaDraining
|
||||
}
|
||||
|
||||
public abstract class BaseWand : BaseBashing, ITokunoDyable
|
||||
{
|
||||
public override WeaponAbility PrimaryAbility => WeaponAbility.Dismount;
|
||||
public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm;
|
||||
public abstract class BaseWand : BaseBashing, ITokunoDyable
|
||||
{
|
||||
private int m_Charges;
|
||||
|
||||
public override int AosStrengthReq => 5;
|
||||
public override int AosMinDamage => 9;
|
||||
public override int AosMaxDamage => 11;
|
||||
public override int AosSpeed => 40;
|
||||
public override float MlSpeed => 2.75f;
|
||||
private WandEffect m_WandEffect;
|
||||
|
||||
public override int OldStrengthReq => 0;
|
||||
public override int OldMinDamage => 2;
|
||||
public override int OldMaxDamage => 6;
|
||||
public override int OldSpeed => 35;
|
||||
public BaseWand(WandEffect effect, int minCharges, int maxCharges) : base(Utility.RandomList(0xDF2, 0xDF3, 0xDF4,
|
||||
0xDF5))
|
||||
{
|
||||
Weight = 1.0;
|
||||
Effect = effect;
|
||||
Charges = Utility.RandomMinMax(minCharges, maxCharges);
|
||||
Attributes.SpellChanneling = 1;
|
||||
Attributes.CastSpeed = -1;
|
||||
WeaponAttributes.MageWeapon = Utility.RandomMinMax(1, 10);
|
||||
}
|
||||
|
||||
public override int InitMinHits => 31;
|
||||
public override int InitMaxHits => 110;
|
||||
public BaseWand(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
private WandEffect m_WandEffect;
|
||||
private int m_Charges;
|
||||
public override WeaponAbility PrimaryAbility => WeaponAbility.Dismount;
|
||||
public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm;
|
||||
|
||||
public virtual TimeSpan GetUseDelay => TimeSpan.FromSeconds( 4.0 );
|
||||
public override int AosStrengthReq => 5;
|
||||
public override int AosMinDamage => 9;
|
||||
public override int AosMaxDamage => 11;
|
||||
public override int AosSpeed => 40;
|
||||
public override float MlSpeed => 2.75f;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public WandEffect Effect
|
||||
{
|
||||
get => m_WandEffect;
|
||||
set{ m_WandEffect = value; InvalidateProperties(); }
|
||||
}
|
||||
public override int OldStrengthReq => 0;
|
||||
public override int OldMinDamage => 2;
|
||||
public override int OldMaxDamage => 6;
|
||||
public override int OldSpeed => 35;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Charges
|
||||
{
|
||||
get => m_Charges;
|
||||
set{ m_Charges = value; InvalidateProperties(); }
|
||||
}
|
||||
public override int InitMinHits => 31;
|
||||
public override int InitMaxHits => 110;
|
||||
|
||||
public BaseWand( WandEffect effect, int minCharges, int maxCharges ) : base( Utility.RandomList( 0xDF2, 0xDF3, 0xDF4, 0xDF5 ) )
|
||||
{
|
||||
Weight = 1.0;
|
||||
Effect = effect;
|
||||
Charges = Utility.RandomMinMax( minCharges, maxCharges );
|
||||
Attributes.SpellChanneling = 1;
|
||||
Attributes.CastSpeed = -1;
|
||||
WeaponAttributes.MageWeapon = Utility.RandomMinMax( 1, 10 );
|
||||
}
|
||||
public virtual TimeSpan GetUseDelay => TimeSpan.FromSeconds(4.0);
|
||||
|
||||
public void ConsumeCharge( Mobile from )
|
||||
{
|
||||
--Charges;
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public WandEffect Effect
|
||||
{
|
||||
get => m_WandEffect;
|
||||
set
|
||||
{
|
||||
m_WandEffect = value;
|
||||
InvalidateProperties();
|
||||
}
|
||||
}
|
||||
|
||||
if ( Charges == 0 )
|
||||
from.SendLocalizedMessage( 1019073 ); // This item is out of charges.
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public int Charges
|
||||
{
|
||||
get => m_Charges;
|
||||
set
|
||||
{
|
||||
m_Charges = value;
|
||||
InvalidateProperties();
|
||||
}
|
||||
}
|
||||
|
||||
ApplyDelayTo( from );
|
||||
}
|
||||
public void ConsumeCharge(Mobile from)
|
||||
{
|
||||
--Charges;
|
||||
|
||||
public BaseWand( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
if (Charges == 0)
|
||||
from.SendLocalizedMessage(1019073); // This item is out of charges.
|
||||
|
||||
public virtual void ApplyDelayTo( Mobile from )
|
||||
{
|
||||
from.BeginAction( typeof( BaseWand ) );
|
||||
Timer.DelayCall<Mobile>(GetUseDelay, ReleaseWandLock_Callback, from);
|
||||
}
|
||||
ApplyDelayTo(from);
|
||||
}
|
||||
|
||||
public virtual void ReleaseWandLock_Callback(Mobile state)
|
||||
{
|
||||
state.EndAction(typeof(BaseWand));
|
||||
}
|
||||
public virtual void ApplyDelayTo(Mobile from)
|
||||
{
|
||||
from.BeginAction(typeof(BaseWand));
|
||||
Timer.DelayCall(GetUseDelay, ReleaseWandLock_Callback, from);
|
||||
}
|
||||
|
||||
public override void OnDoubleClick( Mobile from )
|
||||
{
|
||||
if ( !from.CanBeginAction( typeof( BaseWand ) ) )
|
||||
{
|
||||
from.SendLocalizedMessage( 1070860 ); // You must wait a moment for the wand to recharge.
|
||||
return;
|
||||
}
|
||||
public virtual void ReleaseWandLock_Callback(Mobile state)
|
||||
{
|
||||
state.EndAction(typeof(BaseWand));
|
||||
}
|
||||
|
||||
if ( Parent == from )
|
||||
{
|
||||
if ( Charges > 0 )
|
||||
OnWandUse( from );
|
||||
else
|
||||
from.SendLocalizedMessage( 1019073 ); // This item is out of charges.
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendLocalizedMessage( 502641 ); // You must equip this item to use it.
|
||||
}
|
||||
}
|
||||
public override void OnDoubleClick(Mobile from)
|
||||
{
|
||||
if (!from.CanBeginAction(typeof(BaseWand)))
|
||||
{
|
||||
from.SendLocalizedMessage(1070860); // You must wait a moment for the wand to recharge.
|
||||
return;
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
if (Parent == from)
|
||||
{
|
||||
if (Charges > 0)
|
||||
OnWandUse(from);
|
||||
else
|
||||
from.SendLocalizedMessage(1019073); // This item is out of charges.
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendLocalizedMessage(502641); // You must equip this item to use it.
|
||||
}
|
||||
}
|
||||
|
||||
writer.Write( (int) 0 ); // version
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( (int) m_WandEffect );
|
||||
writer.Write( (int) m_Charges );
|
||||
}
|
||||
writer.Write(0); // version
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
writer.Write((int)m_WandEffect);
|
||||
writer.Write(m_Charges);
|
||||
}
|
||||
|
||||
int version = reader.ReadInt();
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
switch ( version )
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
m_WandEffect = (WandEffect)reader.ReadInt();
|
||||
m_Charges = (int)reader.ReadInt();
|
||||
int version = reader.ReadInt();
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
switch (version)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
m_WandEffect = (WandEffect)reader.ReadInt();
|
||||
m_Charges = reader.ReadInt();
|
||||
|
||||
public override void GetProperties( ObjectPropertyList list )
|
||||
{
|
||||
base.GetProperties( list );
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
switch ( m_WandEffect )
|
||||
{
|
||||
case WandEffect.Clumsiness: list.Add( 1017326, m_Charges.ToString() ); break; // clumsiness charges: ~1_val~
|
||||
case WandEffect.Identification: list.Add( 1017350, m_Charges.ToString() ); break; // identification charges: ~1_val~
|
||||
case WandEffect.Healing: list.Add( 1017329, m_Charges.ToString() ); break; // healing charges: ~1_val~
|
||||
case WandEffect.Feeblemindedness: list.Add( 1017327, m_Charges.ToString() ); break; // feeblemind charges: ~1_val~
|
||||
case WandEffect.Weakness: list.Add( 1017328, m_Charges.ToString() ); break; // weakness charges: ~1_val~
|
||||
case WandEffect.MagicArrow: list.Add( 1060492, m_Charges.ToString() ); break; // magic arrow charges: ~1_val~
|
||||
case WandEffect.Harming: list.Add( 1017334, m_Charges.ToString() ); break; // harm charges: ~1_val~
|
||||
case WandEffect.Fireball: list.Add( 1060487, m_Charges.ToString() ); break; // fireball charges: ~1_val~
|
||||
case WandEffect.GreaterHealing: list.Add( 1017330, m_Charges.ToString() ); break; // greater healing charges: ~1_val~
|
||||
case WandEffect.Lightning: list.Add( 1060491, m_Charges.ToString() ); break; // lightning charges: ~1_val~
|
||||
case WandEffect.ManaDraining: list.Add( 1017339, m_Charges.ToString() ); break; // mana drain charges: ~1_val~
|
||||
}
|
||||
}
|
||||
public override void GetProperties(ObjectPropertyList list)
|
||||
{
|
||||
base.GetProperties(list);
|
||||
|
||||
public override void OnSingleClick( Mobile from )
|
||||
{
|
||||
ArrayList attrs = new ArrayList();
|
||||
switch (m_WandEffect)
|
||||
{
|
||||
case WandEffect.Clumsiness:
|
||||
list.Add(1017326, m_Charges.ToString());
|
||||
break; // clumsiness charges: ~1_val~
|
||||
case WandEffect.Identification:
|
||||
list.Add(1017350, m_Charges.ToString());
|
||||
break; // identification charges: ~1_val~
|
||||
case WandEffect.Healing:
|
||||
list.Add(1017329, m_Charges.ToString());
|
||||
break; // healing charges: ~1_val~
|
||||
case WandEffect.Feeblemindedness:
|
||||
list.Add(1017327, m_Charges.ToString());
|
||||
break; // feeblemind charges: ~1_val~
|
||||
case WandEffect.Weakness:
|
||||
list.Add(1017328, m_Charges.ToString());
|
||||
break; // weakness charges: ~1_val~
|
||||
case WandEffect.MagicArrow:
|
||||
list.Add(1060492, m_Charges.ToString());
|
||||
break; // magic arrow charges: ~1_val~
|
||||
case WandEffect.Harming:
|
||||
list.Add(1017334, m_Charges.ToString());
|
||||
break; // harm charges: ~1_val~
|
||||
case WandEffect.Fireball:
|
||||
list.Add(1060487, m_Charges.ToString());
|
||||
break; // fireball charges: ~1_val~
|
||||
case WandEffect.GreaterHealing:
|
||||
list.Add(1017330, m_Charges.ToString());
|
||||
break; // greater healing charges: ~1_val~
|
||||
case WandEffect.Lightning:
|
||||
list.Add(1060491, m_Charges.ToString());
|
||||
break; // lightning charges: ~1_val~
|
||||
case WandEffect.ManaDraining:
|
||||
list.Add(1017339, m_Charges.ToString());
|
||||
break; // mana drain charges: ~1_val~
|
||||
}
|
||||
}
|
||||
|
||||
if ( DisplayLootType )
|
||||
{
|
||||
if ( LootType == LootType.Blessed )
|
||||
attrs.Add( new EquipInfoAttribute( 1038021 ) ); // blessed
|
||||
else if ( LootType == LootType.Cursed )
|
||||
attrs.Add( new EquipInfoAttribute( 1049643 ) ); // cursed
|
||||
}
|
||||
public override void OnSingleClick(Mobile from)
|
||||
{
|
||||
ArrayList attrs = new ArrayList();
|
||||
|
||||
if ( !Identified )
|
||||
{
|
||||
attrs.Add( new EquipInfoAttribute( 1038000 ) ); // Unidentified
|
||||
}
|
||||
else
|
||||
{
|
||||
int num = 0;
|
||||
if (DisplayLootType)
|
||||
{
|
||||
if (LootType == LootType.Blessed)
|
||||
attrs.Add(new EquipInfoAttribute(1038021)); // blessed
|
||||
else if (LootType == LootType.Cursed)
|
||||
attrs.Add(new EquipInfoAttribute(1049643)); // cursed
|
||||
}
|
||||
|
||||
switch ( m_WandEffect )
|
||||
{
|
||||
case WandEffect.Clumsiness: num = 3002011; break;
|
||||
case WandEffect.Identification: num = 1044063; break;
|
||||
case WandEffect.Healing: num = 3002014; break;
|
||||
case WandEffect.Feeblemindedness: num = 3002013; break;
|
||||
case WandEffect.Weakness: num = 3002018; break;
|
||||
case WandEffect.MagicArrow: num = 3002015; break;
|
||||
case WandEffect.Harming: num = 3002022; break;
|
||||
case WandEffect.Fireball: num = 3002028; break;
|
||||
case WandEffect.GreaterHealing: num = 3002039; break;
|
||||
case WandEffect.Lightning: num = 3002040; break;
|
||||
case WandEffect.ManaDraining: num = 3002041; break;
|
||||
}
|
||||
if (!Identified)
|
||||
{
|
||||
attrs.Add(new EquipInfoAttribute(1038000)); // Unidentified
|
||||
}
|
||||
else
|
||||
{
|
||||
int num = 0;
|
||||
|
||||
if ( num > 0 )
|
||||
attrs.Add( new EquipInfoAttribute( num, m_Charges ) );
|
||||
}
|
||||
switch (m_WandEffect)
|
||||
{
|
||||
case WandEffect.Clumsiness:
|
||||
num = 3002011;
|
||||
break;
|
||||
case WandEffect.Identification:
|
||||
num = 1044063;
|
||||
break;
|
||||
case WandEffect.Healing:
|
||||
num = 3002014;
|
||||
break;
|
||||
case WandEffect.Feeblemindedness:
|
||||
num = 3002013;
|
||||
break;
|
||||
case WandEffect.Weakness:
|
||||
num = 3002018;
|
||||
break;
|
||||
case WandEffect.MagicArrow:
|
||||
num = 3002015;
|
||||
break;
|
||||
case WandEffect.Harming:
|
||||
num = 3002022;
|
||||
break;
|
||||
case WandEffect.Fireball:
|
||||
num = 3002028;
|
||||
break;
|
||||
case WandEffect.GreaterHealing:
|
||||
num = 3002039;
|
||||
break;
|
||||
case WandEffect.Lightning:
|
||||
num = 3002040;
|
||||
break;
|
||||
case WandEffect.ManaDraining:
|
||||
num = 3002041;
|
||||
break;
|
||||
}
|
||||
|
||||
int number;
|
||||
if (num > 0)
|
||||
attrs.Add(new EquipInfoAttribute(num, m_Charges));
|
||||
}
|
||||
|
||||
if ( Name == null )
|
||||
{
|
||||
number = 1017085;
|
||||
}
|
||||
else
|
||||
{
|
||||
LabelTo( from, Name );
|
||||
number = 1041000;
|
||||
}
|
||||
int number;
|
||||
|
||||
if ( attrs.Count == 0 && Crafter == null && Name != null )
|
||||
return;
|
||||
if (Name == null)
|
||||
{
|
||||
number = 1017085;
|
||||
}
|
||||
else
|
||||
{
|
||||
LabelTo(from, Name);
|
||||
number = 1041000;
|
||||
}
|
||||
|
||||
EquipmentInfo eqInfo = new EquipmentInfo( number, Crafter, false, (EquipInfoAttribute[])attrs.ToArray( typeof( EquipInfoAttribute ) ) );
|
||||
if (attrs.Count == 0 && Crafter == null && Name != null)
|
||||
return;
|
||||
|
||||
from.Send( new DisplayEquipmentInfo( this, eqInfo ) );
|
||||
}
|
||||
EquipmentInfo eqInfo = new EquipmentInfo(number, Crafter, false,
|
||||
(EquipInfoAttribute[])attrs.ToArray(typeof(EquipInfoAttribute)));
|
||||
|
||||
public void Cast( Spell spell )
|
||||
{
|
||||
bool m = Movable;
|
||||
from.Send(new DisplayEquipmentInfo(this, eqInfo));
|
||||
}
|
||||
|
||||
Movable = false;
|
||||
spell.Cast();
|
||||
Movable = m;
|
||||
}
|
||||
public void Cast(Spell spell)
|
||||
{
|
||||
bool m = Movable;
|
||||
|
||||
public virtual void OnWandUse( Mobile from )
|
||||
{
|
||||
from.Target = new WandTarget( this );
|
||||
}
|
||||
Movable = false;
|
||||
spell.Cast();
|
||||
Movable = m;
|
||||
}
|
||||
|
||||
public virtual void DoWandTarget( Mobile from, object o )
|
||||
{
|
||||
if ( Deleted || Charges <= 0 || Parent != from || o is StaticTarget || o is LandTarget )
|
||||
return;
|
||||
public virtual void OnWandUse(Mobile from)
|
||||
{
|
||||
from.Target = new WandTarget(this);
|
||||
}
|
||||
|
||||
if ( OnWandTarget( from, o ) )
|
||||
ConsumeCharge( from );
|
||||
}
|
||||
public virtual void DoWandTarget(Mobile from, object o)
|
||||
{
|
||||
if (Deleted || Charges <= 0 || Parent != from || o is StaticTarget || o is LandTarget)
|
||||
return;
|
||||
|
||||
public virtual bool OnWandTarget( Mobile from, object o )
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (OnWandTarget(from, o))
|
||||
ConsumeCharge(from);
|
||||
}
|
||||
|
||||
public virtual bool OnWandTarget(Mobile from, object o)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue