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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

111
Scripts/Holiday Stuff/Halloween/2011/Items/BasePaintedMask.cs
View file

@ -1,76 +1,67 @@
using System;
//using System.Collections.Generic;
//using System.Collections.Generic;
namespace Server.Items.Holiday
{
[TypeAlias( "Server.Items.ClownMask", "Server.Items.DaemonMask", "Server.Items.PlagueMask" )]
public class BasePaintedMask : Item
{
public override string DefaultName
{
get
{
if ( m_Staffer != null )
{
return $"{MaskName} hand painted by {m_Staffer}";
}
[TypeAlias("Server.Items.ClownMask", "Server.Items.DaemonMask", "Server.Items.PlagueMask")]
public class BasePaintedMask : Item
{
private static string[] m_Staffers =
{
"Ryan",
"Mark",
"Krrios",
"Zippy",
"Athena",
"Eos",
"Xavier"
};
return MaskName;
}
}
private string m_Staffer;
public virtual string MaskName => "A Mask";
public BasePaintedMask(int itemid)
: this(m_Staffers[Utility.Random(m_Staffers.Length)], itemid)
{
}
private string m_Staffer;
public BasePaintedMask(string staffer, int itemid)
: base(itemid + Utility.Random(2))
{
m_Staffer = staffer;
private static string[] m_Staffers =
{
"Ryan",
"Mark",
"Krrios",
"Zippy",
"Athena",
"Eos",
"Xavier"
};
Utility.Intern(m_Staffer);
}
public BasePaintedMask( int itemid )
: this( m_Staffers[ Utility.Random( m_Staffers.Length ) ], itemid )
{
public BasePaintedMask(Serial serial) : base(serial)
{
}
}
public override string DefaultName
{
get
{
if (m_Staffer != null) return $"{MaskName} hand painted by {m_Staffer}";
public BasePaintedMask( string staffer, int itemid )
: base( itemid + Utility.Random( 2 ) )
{
m_Staffer = staffer;
return MaskName;
}
}
Utility.Intern( m_Staffer );
}
public virtual string MaskName => "A Mask";
public BasePaintedMask( Serial serial ) : base( serial )
{
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
}
writer.Write(1); // version
writer.Write(m_Staffer);
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
writer.Write( ( int )1 ); // version
writer.Write( ( string )m_Staffer );
}
int version = reader.ReadInt();
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
if ( version == 1 )
{
m_Staffer = Utility.Intern( reader.ReadString() );
}
}
}
}
if (version == 1) m_Staffer = Utility.Intern(reader.ReadString());
}
}
}

48
Scripts/Holiday Stuff/Halloween/2011/Items/ClownMask.cs
View file

@ -1,32 +1,32 @@
namespace Server.Items.Holiday
{
public class PaintedEvilClownMask : BasePaintedMask
{
public override string MaskName => "Evil Clown Mask";
public class PaintedEvilClownMask : BasePaintedMask
{
[Constructible]
public PaintedEvilClownMask()
: base(0x4a90)
{
}
[Constructible]
public PaintedEvilClownMask( )
: base( 0x4a90 )
{
}
public PaintedEvilClownMask(Serial serial)
: base(serial)
{
}
public PaintedEvilClownMask( Serial serial )
: base( serial )
{
}
public override string MaskName => "Evil Clown Mask";
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();
}
}
}

49
Scripts/Holiday Stuff/Halloween/2011/Items/DaemonMask.cs
View file

@ -1,33 +1,32 @@
namespace Server.Items.Holiday
{
public class PaintedDaemonMask : BasePaintedMask
{
public override string MaskName => "Daemon Mask";
public class PaintedDaemonMask : BasePaintedMask
{
[Constructible]
public PaintedDaemonMask()
: base(0x4a92)
{
}
[Constructible]
public PaintedDaemonMask()
: base( 0x4a92 )
{
}
public PaintedDaemonMask(Serial serial)
: base(serial)
{
}
public PaintedDaemonMask( Serial serial )
: base( serial )
{
}
public override string MaskName => "Daemon Mask";
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();
}
}
}

48
Scripts/Holiday Stuff/Halloween/2011/Items/PlagueMask.cs
View file

@ -1,32 +1,32 @@
namespace Server.Items.Holiday
{
public class PaintedPlagueMask : BasePaintedMask
{
public override string MaskName => "Plague Mask";
public class PaintedPlagueMask : BasePaintedMask
{
[Constructible]
public PaintedPlagueMask()
: base(0x4A8E)
{
}
[Constructible]
public PaintedPlagueMask()
: base( 0x4A8E )
{
}
public PaintedPlagueMask(Serial serial)
: base(serial)
{
}
public PaintedPlagueMask( Serial serial )
: base( serial )
{
}
public override string MaskName => "Plague Mask";
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();
}
}
}

201
Scripts/Holiday Stuff/Halloween/2011/Mobiles/PumpkinHead.cs
View file

@ -4,126 +4,127 @@ using Server.Items.Holiday;
namespace Server.Mobiles
{
public class PumpkinHead : BaseCreature
{
public override string CorpseName => "a killer pumpkin corpse";
public override bool AutoDispel => true;
public override bool BardImmune => true;
public override bool Unprovokable => true;
public override bool AreaPeaceImmune => true;
public override string DefaultName => "a killer pumpkin";
public class PumpkinHead : BaseCreature
{
[Constructible]
public PumpkinHead()
: base(Utility.RandomBool() ? AIType.AI_Melee : AIType.AI_Mage, FightMode.Closest, 10, 1, 0.05, 0.1)
{
Body = 1246 + Utility.Random(2);
[Constructible]
public PumpkinHead()
: base( Utility.RandomBool() ? AIType.AI_Melee : AIType.AI_Mage, FightMode.Closest, 10, 1, 0.05, 0.1 )
{
Body = 1246 + Utility.Random( 2 );
BaseSoundID = 268;
BaseSoundID = 268;
SetStr(350);
SetDex(125);
SetInt(250);
SetStr( 350 );
SetDex( 125 );
SetInt( 250 );
SetHits(500);
SetMana(1000);
SetHits( 500 );
SetMana( 1000 );
SetDamage(10, 15);
SetDamage( 10, 15 );
SetDamageType(ResistanceType.Physical, 100);
SetDamageType( ResistanceType.Physical, 100 );
SetResistance(ResistanceType.Physical, 55);
SetResistance(ResistanceType.Fire, 50);
SetResistance(ResistanceType.Cold, 50);
SetResistance(ResistanceType.Poison, 65);
SetResistance(ResistanceType.Energy, 80);
SetResistance( ResistanceType.Physical, 55 );
SetResistance( ResistanceType.Fire, 50 );
SetResistance( ResistanceType.Cold, 50 );
SetResistance( ResistanceType.Poison, 65 );
SetResistance( ResistanceType.Energy, 80 );
SetSkill(SkillName.DetectHidden, 100.0);
SetSkill(SkillName.Meditation, 120.0);
SetSkill(SkillName.Necromancy, 100.0);
SetSkill(SkillName.SpiritSpeak, 120.0);
SetSkill(SkillName.Magery, 160.0);
SetSkill(SkillName.EvalInt, 100.0);
SetSkill(SkillName.MagicResist, 100.0);
SetSkill(SkillName.Tactics, 100.0);
SetSkill(SkillName.Wrestling, 80.0);
SetSkill( SkillName.DetectHidden, 100.0 );
SetSkill( SkillName.Meditation, 120.0 );
SetSkill( SkillName.Necromancy, 100.0 );
SetSkill( SkillName.SpiritSpeak, 120.0 );
SetSkill( SkillName.Magery, 160.0 );
SetSkill( SkillName.EvalInt, 100.0 );
SetSkill( SkillName.MagicResist, 100.0 );
SetSkill( SkillName.Tactics, 100.0 );
SetSkill( SkillName.Wrestling, 80.0 );
Fame = 5000;
Karma = -5000;
Fame = 5000;
Karma = -5000;
VirtualArmor = 49;
}
VirtualArmor = 49;
}
public PumpkinHead(Serial serial)
: base(serial)
{
}
public override void GenerateLoot()
{
if ( Utility.RandomDouble() < .05 )
{
//PackItem( new TwilightLantern() ); OLD Halloween
public override string CorpseName => "a killer pumpkin corpse";
public override bool AutoDispel => true;
public override bool BardImmune => true;
public override bool Unprovokable => true;
public override bool AreaPeaceImmune => true;
public override string DefaultName => "a killer pumpkin";
switch( Utility.Random( 5 ) )
{
case 0: PackItem( new PaintedEvilClownMask() ); break;
case 1: PackItem( new PaintedDaemonMask() ); break;
case 2: PackItem( new PaintedPlagueMask() ); break;
case 3: PackItem( new PaintedEvilJesterMask() ); break;
case 4: PackItem( new PaintedPorcelainMask() ); break;
default: break;
}
}
public override void GenerateLoot()
{
if (Utility.RandomDouble() < .05)
switch (Utility.Random(5))
{
case 0:
PackItem(new PaintedEvilClownMask());
break;
case 1:
PackItem(new PaintedDaemonMask());
break;
case 2:
PackItem(new PaintedPlagueMask());
break;
case 3:
PackItem(new PaintedEvilJesterMask());
break;
case 4:
PackItem(new PaintedPorcelainMask());
break;
}
PackItem( new WrappedCandy() );
AddLoot( LootPack.UltraRich, 2 );
}
PackItem(new WrappedCandy());
AddLoot(LootPack.UltraRich, 2);
}
public virtual void Lifted_Callback( Mobile from )
{
if ( from != null && !from.Deleted && from is PlayerMobile )
{
Combatant = from;
public virtual void Lifted_Callback(Mobile from)
{
if (from != null && !from.Deleted && from is PlayerMobile)
{
Combatant = from;
Warmode = true;
}
}
Warmode = true;
}
}
public override Item NewHarmfulItem()
{
Item bad = new AcidSlime( TimeSpan.FromSeconds( 10 ), 25, 30 );
public override Item NewHarmfulItem()
{
Item bad = new AcidSlime(TimeSpan.FromSeconds(10), 25, 30);
bad.Name = "gooey nasty pumpkin hummus";
bad.Name = "gooey nasty pumpkin hummus";
bad.Hue = 144;
bad.Hue = 144;
return bad;
}
return bad;
}
public override void OnDamage( int amount, Mobile from, bool willKill )
{
if ( Utility.RandomBool() )
{
if ( from?.Map != null && Map != Map.Internal && Map == from.Map && from.InRange( this, 12 ) )
{
SpillAcid( ( willKill ) ? this : from, ( willKill ) ? 3 : 1 );
}
}
public override void OnDamage(int amount, Mobile from, bool willKill)
{
if (Utility.RandomBool())
if (from?.Map != null && Map != Map.Internal && Map == from.Map && from.InRange(this, 12))
SpillAcid(willKill ? this : from, willKill ? 3 : 1);
base.OnDamage( amount, from, willKill );
}
base.OnDamage(amount, from, willKill);
}
public PumpkinHead( Serial serial )
: base( serial )
{
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( ( int )0 );
}
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();
}
}
}