warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bleh whitespace/formatting cleanup.

Browse source
This commit is contained in:
xavier 2010-10-09 16:04:49 +00:00
parent 4df455f33c
commit f660f8160b
12 changed files with 866 additions and 871 deletions
Download patch file Download diff file Expand all files Collapse all files

1050
Scripts/Mobiles/Townfolk/BaseEscortable.cs
View file

File diff suppressed because it is too large Load diff

26
Scripts/Mobiles/Vendors/PlayerVendor.cs
View file

@ -1468,18 +1468,18 @@ namespace Server.Mobiles
int price;
string description;
if ( int.TryParse( firstWord, out price ) )
{
if ( sep >= 0 )
description = text.Substring( sep + 1 ).Trim();
else
description = "";
}
else
{
price = -1;
description = text.Trim();
if ( int.TryParse( firstWord, out price ) )
{
if ( sep >= 0 )
description = text.Substring( sep + 1 ).Trim();
else
description = "";
}
else
{
price = -1;
description = text.Trim();
}
SetInfo( from, price, Utility.FixHtml( description ) );
}
@ -1560,8 +1560,8 @@ namespace Server.Mobiles
int amount;
if ( !int.TryParse( text, out amount ) )
amount = 0;
if ( !int.TryParse( text, out amount ) )
amount = 0;
GiveGold( from, amount );
}

100
Scripts/Multis/Camps/BaseCamp.cs
View file

@ -13,22 +13,28 @@ namespace Server.Multis
private List<Mobile> m_Mobiles;
private DateTime m_DecayTime;
private Timer m_DecayTimer;
private TimeSpan m_DecayDelay;
private TimeSpan m_DecayDelay;
public virtual int EventRange{ get{ return 10; } }
public virtual TimeSpan DecayDelay {
get { return m_DecayDelay; }
set {
m_DecayDelay = value;
RefreshDecay( true );
}
}
public virtual TimeSpan DecayDelay
{
get
{
return m_DecayDelay;
}
set
{
m_DecayDelay = value;
RefreshDecay( true );
}
}
public BaseCamp( int multiID ) : base( multiID | 0x4000 )
{
m_Items = new List<Item>();
m_Mobiles = new List<Mobile>();
m_DecayDelay = TimeSpan.FromMinutes( 30.0 );
m_DecayDelay = TimeSpan.FromMinutes( 30.0 );
RefreshDecay( true );
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( CheckAddComponents ) );
@ -38,8 +44,8 @@ namespace Server.Multis
{
m_Items = new List<Item>();
m_Mobiles = new List<Mobile>();
m_DecayDelay = TimeSpan.FromMinutes(30.0);
RefreshDecay(true);
m_DecayDelay = TimeSpan.FromMinutes(30.0);
RefreshDecay(true);
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( CheckAddComponents ) );
}
@ -74,16 +80,16 @@ namespace Server.Multis
{
m_Items.Add( item );
int zavg = Map.GetAverageZ(X + xOffset, Y + yOffset);
int zavg = Map.GetAverageZ(X + xOffset, Y + yOffset);
item.MoveToWorld( new Point3D( X + xOffset, Y + yOffset, zavg + zOffset ), Map );
}
public virtual void AddMobile( Mobile m, int wanderRange, int xOffset, int yOffset, int zOffset )
{
m_Mobiles.Add(m);
m_Mobiles.Add(m);
int zavg = Map.GetAverageZ(X + xOffset, Y + yOffset);
Point3D loc = new Point3D(X + xOffset, Y + yOffset, zavg + zOffset);
int zavg = Map.GetAverageZ(X + xOffset, Y + yOffset);
Point3D loc = new Point3D(X + xOffset, Y + yOffset, zavg + zOffset);
BaseCreature bc = m as BaseCreature;
if ( bc != null )
@ -128,15 +134,15 @@ namespace Server.Multis
for ( int i = 0; i < m_Items.Count; ++i )
m_Items[i].Delete();
for ( int i = 0; i < m_Mobiles.Count; ++i )
{
BaseCreature bc = (BaseCreature)m_Mobiles[i];
for ( int i = 0; i < m_Mobiles.Count; ++i )
{
BaseCreature bc = (BaseCreature)m_Mobiles[i];
if ( bc.IsPrisoner == false )
m_Mobiles[i].Delete();
else if ( m_Mobiles[i].CantWalk == true )
m_Mobiles[i].Delete();
}
if ( bc.IsPrisoner == false )
m_Mobiles[i].Delete();
else if ( m_Mobiles[i].CantWalk == true )
m_Mobiles[i].Delete();
}
m_Items.Clear();
m_Mobiles.Clear();
@ -179,35 +185,33 @@ namespace Server.Multis
}
}
public class LockableBarrel : LockableContainer
{
[Constructable]
public LockableBarrel()
: base(0xE77)
{
Weight = 1.0;
}
public class LockableBarrel : LockableContainer
{
[Constructable]
public LockableBarrel() : base(0xE77)
{
Weight = 1.0;
}
public LockableBarrel(Serial serial)
: base(serial)
{
}
public LockableBarrel(Serial serial) : base(serial)
{
}
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((int)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();
if (Weight == 8.0)
Weight = 1.0;
}
}
if (Weight == 8.0)
Weight = 1.0;
}
}
}

110
Scripts/Multis/Camps/BrigandCamp.cs
View file

@ -24,11 +24,11 @@ namespace Server.Multis
BaseCreature bc;
//BaseEscortable be;
Visible = false;
DecayDelay = TimeSpan.FromMinutes( 5.0 );
Visible = false;
DecayDelay = TimeSpan.FromMinutes( 5.0 );
AddItem(new Static(0x10ee), 0, 0, 0);
AddItem(new Static(0xfac), 0, 7, 0);
AddItem(new Static(0x10ee), 0, 0, 0);
AddItem(new Static(0xfac), 0, 7, 0);
switch ( Utility.Random( 3 ) )
{
@ -43,14 +43,14 @@ namespace Server.Multis
AddItem( new Item( 0x1E95 ), 0, 7, 1 ); // Rabbit on a spit
break;
}
default:
default:
{
AddItem( new Item( 0x1E94 ), 0, 7, 1 ); // Chicken on a spit
break;
}
}
AddCampChests();
AddCampChests();
for ( int i = 0; i < 4; i ++ )
{
@ -60,7 +60,7 @@ namespace Server.Multis
switch ( Utility.Random( 2 ) )
{
case 0: m_Prisoner = new Noble(); break;
default: m_Prisoner = new SeekerOfAdventure(); break;
default: m_Prisoner = new SeekerOfAdventure(); break;
}
//be = (BaseEscortable)m_Prisoner;
@ -74,63 +74,63 @@ namespace Server.Multis
AddMobile( m_Prisoner, 2, Utility.RandomMinMax( -2, 2 ), Utility.RandomMinMax( -2, 2 ), 0 );
}
private void AddCampChests()
{
LockableContainer chest = null;
private void AddCampChests()
{
LockableContainer chest = null;
switch (Utility.Random(3))
{
case 0: chest = new MetalChest(); break;
case 1: chest = new MetalGoldenChest(); break;
default: chest = new WoodenChest(); break;
}
switch (Utility.Random(3))
{
case 0: chest = new MetalChest(); break;
case 1: chest = new MetalGoldenChest(); break;
default: chest = new WoodenChest(); break;
}
chest.LiftOverride = true;
chest.LiftOverride = true;
TreasureMapChest.Fill(chest, 1);
TreasureMapChest.Fill(chest, 1);
AddItem(chest, -2, -2, 0);
AddItem(chest, -2, -2, 0);
LockableContainer crates = null;
LockableContainer crates = null;
switch (Utility.Random(4))
{
case 0: crates = new SmallCrate(); break;
case 1: crates = new MediumCrate(); break;
case 2: crates = new LargeCrate(); break;
default: crates = new LockableBarrel(); break;
}
switch (Utility.Random(4))
{
case 0: crates = new SmallCrate(); break;
case 1: crates = new MediumCrate(); break;
case 2: crates = new LargeCrate(); break;
default: crates = new LockableBarrel(); break;
}
crates.TrapType = TrapType.ExplosionTrap;
crates.TrapPower = Utility.RandomMinMax(30, 40);
crates.TrapLevel = 2;
crates.TrapType = TrapType.ExplosionTrap;
crates.TrapPower = Utility.RandomMinMax(30, 40);
crates.TrapLevel = 2;
crates.RequiredSkill = 76;
crates.LockLevel = 66;
crates.MaxLockLevel = 116;
crates.Locked = true;
crates.RequiredSkill = 76;
crates.LockLevel = 66;
crates.MaxLockLevel = 116;
crates.Locked = true;
crates.DropItem(new Gold(Utility.RandomMinMax(100, 400)));
crates.DropItem(new Arrow(10));
crates.DropItem(new Bolt(10));
crates.DropItem(new Gold(Utility.RandomMinMax(100, 400)));
crates.DropItem(new Arrow(10));
crates.DropItem(new Bolt(10));
crates.LiftOverride = true;
crates.LiftOverride = true;
if (Utility.RandomDouble() < 0.8)
{
switch (Utility.Random(4))
{
case 0: crates.DropItem(new LesserCurePotion()); break;
case 1: crates.DropItem(new LesserExplosionPotion()); break;
case 2: crates.DropItem(new LesserHealPotion()); break;
default: crates.DropItem(new LesserPoisonPotion()); break;
}
}
if (Utility.RandomDouble() < 0.8)
{
switch (Utility.Random(4))
{
case 0: crates.DropItem(new LesserCurePotion()); break;
case 1: crates.DropItem(new LesserExplosionPotion()); break;
case 2: crates.DropItem(new LesserHealPotion()); break;
default: crates.DropItem(new LesserPoisonPotion()); break;
}
}
AddItem(crates, 2, 2, 0);
}
AddItem(crates, 2, 2, 0);
}
// Don't refresh decay timer
// Don't refresh decay timer
public override void OnEnter( Mobile m )
{
if ( m.Player && m_Prisoner != null && m_Prisoner.CantWalk )
@ -152,10 +152,10 @@ namespace Server.Multis
}
}
// Don't refresh decay timer
public override void OnExit(Mobile m)
{
}
// Don't refresh decay timer
public override void OnExit(Mobile m)
{
}
public BrigandCamp( Serial serial ) : base( serial )
{

54
Scripts/Multis/Camps/LizardmenCamp.cs
View file

@ -5,7 +5,7 @@ using Server.Mobiles;
namespace Server.Multis
{
public class LizardmenCamp : BaseCamp
public class LizardmenCamp : BaseCamp
{
public virtual Mobile Lizardmen{ get{ return new Lizardman(); } }
@ -23,33 +23,33 @@ namespace Server.Multis
BaseCreature bc;
//BaseEscortable be;
Visible = false;
DecayDelay = TimeSpan.FromMinutes( 5.0 );
AddItem(new Static(0x10ee), 0, 0, 0);
AddItem(new Static(0xfac), 0, 7, 0);
Visible = false;
DecayDelay = TimeSpan.FromMinutes( 5.0 );
AddItem(new Static(0x10ee), 0, 0, 0);
AddItem(new Static(0xfac), 0, 7, 0);
switch ( Utility.Random( 3 ) )
{
case 0:
{
AddItem( new Item( 0xDE3 ), 0, 7, 0 ); // Campfire
AddItem( new Item( 0x974 ), 0, 7, 1); // Cauldron
AddItem( new Item( 0x974 ), 0, 7, 1); // Cauldron
break;
}
case 1:
{
AddItem( new Item( 0x1E95 ), 0, 7, 1); // Rabbit on a spit
AddItem( new Item( 0x1E95 ), 0, 7, 1); // Rabbit on a spit
break;
}
default:
default:
{
AddItem( new Item( 0x1E94 ), 0, 7, 1); // Chicken on a spit
AddItem( new Item( 0x1E94 ), 0, 7, 1); // Chicken on a spit
break;
}
}
AddItem(new Item(0x41F), 4, 4, 0); // Gruesome Standart South
AddItem(new Item(0x41F), 4, 4, 0); // Gruesome Standart South
AddCampChests();
AddCampChests();
for ( int i = 0; i < 4; i ++ )
{
@ -59,7 +59,7 @@ namespace Server.Multis
switch ( Utility.Random( 2 ) )
{
case 0: m_Prisoner = new Noble(); break;
default: m_Prisoner = new SeekerOfAdventure(); break;
default: m_Prisoner = new SeekerOfAdventure(); break;
}
//be = (BaseEscortable)m_Prisoner;
@ -73,18 +73,18 @@ namespace Server.Multis
AddMobile( m_Prisoner, 2, Utility.RandomMinMax( -2, 2 ), Utility.RandomMinMax( -2, 2 ), 0 );
}
private void AddCampChests()
{
private void AddCampChests()
{
LockableContainer chest = null;
switch ( Utility.Random( 3 ) )
{
case 0: chest = new MetalChest(); break;
case 1: chest = new MetalGoldenChest(); break;
default: chest = new WoodenChest(); break;
default: chest = new WoodenChest(); break;
}
chest.LiftOverride = true;
chest.LiftOverride = true;
TreasureMapChest.Fill( chest, 1 );
@ -97,7 +97,7 @@ namespace Server.Multis
case 0: crates = new SmallCrate(); break;
case 1: crates = new MediumCrate(); break;
case 2: crates = new LargeCrate(); break;
default: crates = new LockableBarrel(); break;
default: crates = new LockableBarrel(); break;
}
crates.TrapType = TrapType.ExplosionTrap;
@ -113,7 +113,7 @@ namespace Server.Multis
crates.DropItem( new Arrow( 10 ) );
crates.DropItem( new Bolt( 10 ) );
crates.LiftOverride = true;
crates.LiftOverride = true;
if ( Utility.RandomDouble() < 0.8 )
{
@ -122,15 +122,15 @@ namespace Server.Multis
case 0: crates.DropItem( new LesserCurePotion() ); break;
case 1: crates.DropItem( new LesserExplosionPotion() ); break;
case 2: crates.DropItem( new LesserHealPotion() ); break;
default: crates.DropItem(new LesserPoisonPotion()); break;
default: crates.DropItem(new LesserPoisonPotion()); break;
}
}
AddItem( crates, -2, 2, 0 );
}
}
// Don't refresh decay timer
public override void OnEnter(Mobile m)
// Don't refresh decay timer
public override void OnEnter(Mobile m)
{
if ( m.Player && m_Prisoner != null && m_Prisoner.CantWalk )
{
@ -145,16 +145,16 @@ namespace Server.Multis
case 4: number = 502265; break; // Help! Please!
case 5: number = 502266; break; // Aaah! Help me!
case 6: number = 502267; break; // Go and get some help!
default: number = 502268; break; // Quickly, I beg thee! Unlock my chains! If thou dost look at me close thou canst see them.
default: number = 502268; break; // Quickly, I beg thee! Unlock my chains! If thou dost look at me close thou canst see them.
}
m_Prisoner.Yell( number );
}
}
// Don't refresh decay timer
public override void OnExit(Mobile m)
{
}
// Don't refresh decay timer
public override void OnExit(Mobile m)
{
}
public LizardmenCamp( Serial serial ) : base( serial )
{

114
Scripts/Multis/Camps/OrcCamp.cs
View file

@ -23,10 +23,10 @@ namespace Server.Multis
BaseCreature bc;
//BaseEscortable be;
Visible = false;
DecayDelay = TimeSpan.FromMinutes(5.0);
AddItem(new Static(0x10ee), 0, 0, 0);
AddItem(new Static(0xfac), 0, 7, 0);
Visible = false;
DecayDelay = TimeSpan.FromMinutes(5.0);
AddItem(new Static(0x10ee), 0, 0, 0);
AddItem(new Static(0xfac), 0, 7, 0);
switch ( Utility.Random( 3 ) )
{
@ -41,15 +41,15 @@ namespace Server.Multis
AddItem( new Item( 0x1E95 ), 0, 7, 1 ); // Rabbit on a spit
break;
}
default:
default:
{
AddItem( new Item( 0x1E94 ), 0, 7, 1 ); // Chicken on a spit
break;
}
}
AddItem(new Item(0x428), -5, -4, 0); // Gruesome Standart West
AddItem(new Item(0x428), -5, -4, 0); // Gruesome Standart West
AddCampChests();
AddCampChests();
for ( int i = 0; i < 3; i ++ )
{
@ -60,7 +60,7 @@ namespace Server.Multis
switch ( Utility.Random( 2 ) )
{
case 0: m_Prisoner = new Noble(); break;
default: m_Prisoner = new SeekerOfAdventure(); break;
default: m_Prisoner = new SeekerOfAdventure(); break;
}
//be = (BaseEscortable)m_Prisoner;
@ -74,64 +74,64 @@ namespace Server.Multis
AddMobile( m_Prisoner, 2, Utility.RandomMinMax( -2, 2 ), Utility.RandomMinMax( -2, 2 ), 0 );
}
private void AddCampChests()
{
LockableContainer chest = null;
private void AddCampChests()
{
LockableContainer chest = null;
switch (Utility.Random(3))
{
case 0: chest = new MetalChest(); break;
case 1: chest = new MetalGoldenChest(); break;
default: chest = new WoodenChest(); break;
}
switch (Utility.Random(3))
{
case 0: chest = new MetalChest(); break;
case 1: chest = new MetalGoldenChest(); break;
default: chest = new WoodenChest(); break;
}
chest.LiftOverride = true;
chest.LiftOverride = true;
TreasureMapChest.Fill(chest, 1);
TreasureMapChest.Fill(chest, 1);
AddItem(chest, -2, 2, 0);
AddItem(chest, -2, 2, 0);
LockableContainer crates = null;
LockableContainer crates = null;
switch (Utility.Random(4))
{
case 0: crates = new SmallCrate(); break;
case 1: crates = new MediumCrate(); break;
case 2: crates = new LargeCrate(); break;
default: crates = new LockableBarrel(); break;
}
switch (Utility.Random(4))
{
case 0: crates = new SmallCrate(); break;
case 1: crates = new MediumCrate(); break;
case 2: crates = new LargeCrate(); break;
default: crates = new LockableBarrel(); break;
}
crates.TrapType = TrapType.ExplosionTrap;
crates.TrapPower = Utility.RandomMinMax(30, 40);
crates.TrapLevel = 2;
crates.TrapType = TrapType.ExplosionTrap;
crates.TrapPower = Utility.RandomMinMax(30, 40);
crates.TrapLevel = 2;
crates.RequiredSkill = 76;
crates.LockLevel = 66;
crates.MaxLockLevel = 116;
crates.Locked = true;
crates.RequiredSkill = 76;
crates.LockLevel = 66;
crates.MaxLockLevel = 116;
crates.Locked = true;
crates.DropItem(new Gold(Utility.RandomMinMax(100, 400)));
crates.DropItem(new Arrow(10));
crates.DropItem(new Bolt(10));
crates.DropItem(new Gold(Utility.RandomMinMax(100, 400)));
crates.DropItem(new Arrow(10));
crates.DropItem(new Bolt(10));
crates.LiftOverride = true;
crates.LiftOverride = true;
if (Utility.RandomDouble() < 0.8)
{
switch (Utility.Random(4))
{
case 0: crates.DropItem(new LesserCurePotion()); break;
case 1: crates.DropItem(new LesserExplosionPotion()); break;
case 2: crates.DropItem(new LesserHealPotion()); break;
default: crates.DropItem(new LesserPoisonPotion()); break;
}
}
if (Utility.RandomDouble() < 0.8)
{
switch (Utility.Random(4))
{
case 0: crates.DropItem(new LesserCurePotion()); break;
case 1: crates.DropItem(new LesserExplosionPotion()); break;
case 2: crates.DropItem(new LesserHealPotion()); break;
default: crates.DropItem(new LesserPoisonPotion()); break;
}
}
AddItem(crates, 2, -2, 0);
}
AddItem(crates, 2, -2, 0);
}
// Don't refresh decay timer
public override void OnEnter(Mobile m)
// Don't refresh decay timer
public override void OnEnter(Mobile m)
{
if ( m.Player && m_Prisoner != null && m_Prisoner.CantWalk )
{
@ -152,10 +152,10 @@ namespace Server.Multis
}
}
// Don't refresh decay timer
public override void OnExit(Mobile m)
{
}
// Don't refresh decay timer
public override void OnExit(Mobile m)
{
}
public OrcCamp( Serial serial ) : base( serial )
{

116
Scripts/Multis/Camps/RatCamp.cs
View file

@ -23,10 +23,10 @@ namespace Server.Multis
BaseCreature bc;
//BaseEscortable be;
Visible = false;
DecayDelay = TimeSpan.FromMinutes(5.0);
AddItem(new Static(0x10ee), 0, 0, 0);
AddItem(new Static(0xfac), 0, 6, 0);
Visible = false;
DecayDelay = TimeSpan.FromMinutes(5.0);
AddItem(new Static(0x10ee), 0, 0, 0);
AddItem(new Static(0xfac), 0, 6, 0);
switch ( Utility.Random( 3 ) )
{
@ -41,15 +41,15 @@ namespace Server.Multis
AddItem( new Item( 0x1E95 ), 0, 6, 1 ); // Rabbit on a spit
break;
}
default:
default:
{
AddItem( new Item( 0x1E94 ), 0, 6, 1 ); // Chicken on a spit
break;
}
}
AddItem(new Item(0x41F), 5, 5, 0); // Gruesome Standart South
AddItem(new Item(0x41F), 5, 5, 0); // Gruesome Standart South
AddCampChests();
AddCampChests();
for ( int i = 0; i < 4; i ++ )
{
@ -59,7 +59,7 @@ namespace Server.Multis
switch ( Utility.Random( 2 ) )
{
case 0: m_Prisoner = new Noble(); break;
default: m_Prisoner = new SeekerOfAdventure(); break;
default: m_Prisoner = new SeekerOfAdventure(); break;
}
//be = (BaseEscortable)m_Prisoner;
@ -73,64 +73,64 @@ namespace Server.Multis
AddMobile( m_Prisoner, 2, Utility.RandomMinMax( -2, 2 ), Utility.RandomMinMax( -2, 2 ), 0 );
}
private void AddCampChests()
{
LockableContainer chest = null;
private void AddCampChests()
{
LockableContainer chest = null;
switch (Utility.Random(3))
{
case 0: chest = new MetalChest(); break;
case 1: chest = new MetalGoldenChest(); break;
default: chest = new WoodenChest(); break;
}
switch (Utility.Random(3))
{
case 0: chest = new MetalChest(); break;
case 1: chest = new MetalGoldenChest(); break;
default: chest = new WoodenChest(); break;
}
chest.LiftOverride = true;
chest.LiftOverride = true;
TreasureMapChest.Fill(chest, 1);
TreasureMapChest.Fill(chest, 1);
AddItem(chest, -2, -2, 0);
AddItem(chest, -2, -2, 0);
LockableContainer crates = null;
LockableContainer crates = null;
switch (Utility.Random(4))
{
case 0: crates = new SmallCrate(); break;
case 1: crates = new MediumCrate(); break;
case 2: crates = new LargeCrate(); break;
default: crates = new LockableBarrel(); break;
}
switch (Utility.Random(4))
{
case 0: crates = new SmallCrate(); break;
case 1: crates = new MediumCrate(); break;
case 2: crates = new LargeCrate(); break;
default: crates = new LockableBarrel(); break;
}
crates.TrapType = TrapType.ExplosionTrap;
crates.TrapPower = Utility.RandomMinMax(30, 40);
crates.TrapLevel = 2;
crates.TrapType = TrapType.ExplosionTrap;
crates.TrapPower = Utility.RandomMinMax(30, 40);
crates.TrapLevel = 2;
crates.RequiredSkill = 76;
crates.LockLevel = 66;
crates.MaxLockLevel = 116;
crates.Locked = true;
crates.RequiredSkill = 76;
crates.LockLevel = 66;
crates.MaxLockLevel = 116;
crates.Locked = true;
crates.DropItem(new Gold(Utility.RandomMinMax(100, 400)));
crates.DropItem(new Arrow(10));
crates.DropItem(new Bolt(10));
crates.DropItem(new Gold(Utility.RandomMinMax(100, 400)));
crates.DropItem(new Arrow(10));
crates.DropItem(new Bolt(10));
crates.LiftOverride = true;
crates.LiftOverride = true;
if (Utility.RandomDouble() < 0.8)
{
switch (Utility.Random(4))
{
case 0: crates.DropItem(new LesserCurePotion()); break;
case 1: crates.DropItem(new LesserExplosionPotion()); break;
case 2: crates.DropItem(new LesserHealPotion()); break;
default: crates.DropItem(new LesserPoisonPotion()); break;
}
}
if (Utility.RandomDouble() < 0.8)
{
switch (Utility.Random(4))
{
case 0: crates.DropItem(new LesserCurePotion()); break;
case 1: crates.DropItem(new LesserExplosionPotion()); break;
case 2: crates.DropItem(new LesserHealPotion()); break;
default: crates.DropItem(new LesserPoisonPotion()); break;
}
}
AddItem(crates, 2, 2, 0);
}
AddItem(crates, 2, 2, 0);
}
// Don't refresh decay timer
public override void OnEnter(Mobile m)
// Don't refresh decay timer
public override void OnEnter(Mobile m)
{
if ( m.Player && m_Prisoner != null && m_Prisoner.CantWalk )
{
@ -145,16 +145,16 @@ namespace Server.Multis
case 4: number = 502265; break; // Help! Please!
case 5: number = 502266; break; // Aaah! Help me!
case 6: number = 502267; break; // Go and get some help!
default: number = 502268; break; // Quickly, I beg thee! Unlock my chains! If thou dost look at me close thou canst see them.
default: number = 502268; break; // Quickly, I beg thee! Unlock my chains! If thou dost look at me close thou canst see them.
}
m_Prisoner.Yell( number );
}
}
// Don't refresh decay timer
public override void OnExit(Mobile m)
{
}
// Don't refresh decay timer
public override void OnExit(Mobile m)
{
}
public RatCamp( Serial serial ) : base( serial )
{

60
Scripts/Spells/Necromancy/MindRot.cs
View file

@ -133,38 +133,38 @@ namespace Server.Spells.Necromancy
}
public class MRExpireTimer : Timer
{
private Mobile m_Caster;
private Mobile m_Target;
private DateTime m_End;
public MRExpireTimer( Mobile caster, Mobile target, TimeSpan delay ) : base( TimeSpan.FromSeconds( 1.0 ), TimeSpan.FromSeconds( 1.0 ) )
{
m_Caster = caster;
m_Target = target;
m_End = DateTime.Now + delay;
Priority = TimerPriority.TwoFiftyMS;
}
public void RenewDelay(TimeSpan delay)
{
m_End = DateTime.Now + delay;
}
{
private Mobile m_Caster;
private Mobile m_Target;
private DateTime m_End;
public void Halt()
{
Stop();
}
public MRExpireTimer( Mobile caster, Mobile target, TimeSpan delay ) : base( TimeSpan.FromSeconds( 1.0 ), TimeSpan.FromSeconds( 1.0 ) )
{
m_Caster = caster;
m_Target = target;
m_End = DateTime.Now + delay;
Priority = TimerPriority.TwoFiftyMS;
}
public void RenewDelay(TimeSpan delay)
{
m_End = DateTime.Now + delay;
}
protected override void OnTick()
{
if ( m_Target.Deleted || !m_Target.Alive || DateTime.Now >= m_End )
{
MindRotSpell.ClearMindRotScalar( m_Target );
Stop();
}
}
}
public void Halt()
{
Stop();
}
protected override void OnTick()
{
if ( m_Target.Deleted || !m_Target.Alive || DateTime.Now >= m_End )
{
MindRotSpell.ClearMindRotScalar( m_Target );
Stop();
}
}
}
public class MRBucket
{

11
Scripts/Spells/Spellweaving/EssenceOfWind.cs
View file

@ -6,17 +6,14 @@ namespace Server.Spells.Spellweaving
{
public class EssenceOfWindSpell : ArcanistSpell
{
private static SpellInfo m_Info = new SpellInfo(
"Essence of Wind", "Anathrae",
-1
);
private static SpellInfo m_Info = new SpellInfo( "Essence of Wind", "Anathrae", -1 );
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 3.0 ); } }
public override double RequiredSkill { get { return 52.0; } }
public override int RequiredMana { get { return 40; } }
public override double RequiredSkill { get { return 52.0; } }
public override int RequiredMana { get { return 40; } }
public EssenceOfWindSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
public EssenceOfWindSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
}

74
Scripts/Spells/Spellweaving/Items/ArcaneFocus.cs
View file

@ -3,53 +3,53 @@ using Server;
namespace Server.Items
{
public class ArcaneFocus : TransientItem
{
public override int LabelNumber { get { return 1032629; } } // Arcane Focus
public class ArcaneFocus : TransientItem
{
public override int LabelNumber { get { return 1032629; } } // Arcane Focus
private int m_StrengthBonus;
private int m_StrengthBonus;
[CommandProperty( AccessLevel.GameMaster )]
public int StrengthBonus
{
get { return m_StrengthBonus; }
set { m_StrengthBonus = value; }
}
[CommandProperty( AccessLevel.GameMaster )]
public int StrengthBonus
{
get { return m_StrengthBonus; }
set { m_StrengthBonus = value; }
}
public ArcaneFocus( TimeSpan lifeSpan, int strengthBonus ) : base( 0x3155, lifeSpan )
{
LootType = LootType.Blessed;
m_StrengthBonus = strengthBonus;
}
public ArcaneFocus( TimeSpan lifeSpan, int strengthBonus ) : base( 0x3155, lifeSpan )
{
LootType = LootType.Blessed;
m_StrengthBonus = strengthBonus;
}
public ArcaneFocus( Serial serial ) : base( serial )
{
}
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
public ArcaneFocus( Serial serial ) : base( serial )
{
}
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
list.Add( 1060485, m_StrengthBonus.ToString() ); // strength bonus ~1_val~
}
list.Add( 1060485, m_StrengthBonus.ToString() ); // strength bonus ~1_val~
}
public override TextDefinition InvalidTransferMessage{ get { return 1073480; } } // Your arcane focus disappears.
public override bool Nontransferable { get { return true; } }
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 );
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int)0 );
writer.Write( m_StrengthBonus );
}
writer.Write( m_StrengthBonus );
}
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();
m_StrengthBonus = reader.ReadInt();
}
}
m_StrengthBonus = reader.ReadInt();
}
}
}

11
Scripts/Spells/Spellweaving/ReaperForm.cs
View file

@ -5,10 +5,7 @@ namespace Server.Spells.Spellweaving
{
public class ReaperFormSpell : ArcaneForm
{
private static SpellInfo m_Info = new SpellInfo(
"Reaper Form", "Tarisstree",
-1
);
private static SpellInfo m_Info = new SpellInfo( "Reaper Form", "Tarisstree", -1 );
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 2.5 ); } }
@ -25,8 +22,8 @@ namespace Server.Spells.Spellweaving
e.Mobile.Send( SpeedControl.WalkSpeed );
}
public override double RequiredSkill { get { return 24.0; } }
public override int RequiredMana { get { return 34; } }
public override double RequiredSkill { get { return 24.0; } }
public override int RequiredMana { get { return 34; } }
public override int Body { get { return 0x11D; } }
@ -39,7 +36,7 @@ namespace Server.Spells.Spellweaving
public virtual int SwingSpeedBonus { get { return 10 + FocusLevel; } }
public virtual int SpellDamageBonus { get { return 10 + FocusLevel; } }
public ReaperFormSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
public ReaperFormSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
}

11
Scripts/Spells/Spellweaving/WordOfDeath.cs
View file

@ -6,17 +6,14 @@ namespace Server.Spells.Spellweaving
{
public class WordOfDeathSpell : ArcanistSpell
{
private static SpellInfo m_Info = new SpellInfo(
"Word of Death", "Nyraxle",
-1
);
private static SpellInfo m_Info = new SpellInfo( "Word of Death", "Nyraxle", -1 );
public override TimeSpan CastDelayBase { get { return TimeSpan.FromSeconds( 3.5 ); } }
public override double RequiredSkill { get { return 80.0; } }
public override int RequiredMana { get { return 50; } }
public override double RequiredSkill { get { return 80.0; } }
public override int RequiredMana { get { return 50; } }
public WordOfDeathSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
public WordOfDeathSpell( Mobile caster, Item scroll ) : base( caster, scroll, m_Info )
{
}