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

44
Scripts/Engines/Quests/Witch Apprentice/Items/Cauldron.cs
View file

@ -1,31 +1,31 @@
namespace Server.Items
{
public class Cauldron : Item
{
public override string DefaultName => "a cauldron";
public class Cauldron : Item
{
[Constructible]
public Cauldron() : base(0x9ED)
{
Weight = 1.0;
}
[Constructible]
public Cauldron() : base( 0x9ED )
{
Weight = 1.0;
}
public Cauldron(Serial serial) : base(serial)
{
}
public Cauldron( Serial serial ) : base( serial )
{
}
public override string DefaultName => "a cauldron";
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();
}
}
}

146
Scripts/Engines/Quests/Witch Apprentice/Items/HagApprenticeCorpse.cs
View file

@ -1,101 +1,97 @@
using System.Collections.Generic;
using Server.Items;
using Server.Misc;
using Server.Mobiles;
using Server.Network;
using Server.Misc;
namespace Server.Engines.Quests.Hag
{
public class HagApprenticeCorpse : Corpse
{
private static Mobile GetOwner()
{
Mobile apprentice = new Mobile();
public class HagApprenticeCorpse : Corpse
{
[Constructible]
public HagApprenticeCorpse() : base(GetOwner(), GetEquipment())
{
Direction = Direction.South;
apprentice.Hue = Utility.RandomSkinHue();
apprentice.Female = false;
apprentice.Body = 0x190;
foreach (Item item in EquipItems) DropItem(item);
}
apprentice.Delete();
public HagApprenticeCorpse(Serial serial) : base(serial)
{
}
return apprentice;
}
private static Mobile GetOwner()
{
Mobile apprentice = new Mobile();
private static List<Item> GetEquipment()
{
return new List<Item>();
}
apprentice.Hue = Utility.RandomSkinHue();
apprentice.Female = false;
apprentice.Body = 0x190;
public override void AddNameProperty( ObjectPropertyList list )
{
list.Add( "a charred corpse" );
}
apprentice.Delete();
public override void OnSingleClick( Mobile from )
{
int hue = Notoriety.GetHue( NotorietyHandlers.CorpseNotoriety( from, this ) );
return apprentice;
}
from.Send( new AsciiMessage( Serial, ItemID, MessageType.Label, hue, 3, "", "a charred corpse" ) );
}
private static List<Item> GetEquipment()
{
return new List<Item>();
}
[Constructible]
public HagApprenticeCorpse() : base( GetOwner(), GetEquipment() )
{
Direction = Direction.South;
public override void AddNameProperty(ObjectPropertyList list)
{
list.Add("a charred corpse");
}
foreach ( Item item in EquipItems )
{
DropItem( item );
}
}
public override void OnSingleClick(Mobile from)
{
int hue = Notoriety.GetHue(NotorietyHandlers.CorpseNotoriety(from, this));
public HagApprenticeCorpse( Serial serial ) : base( serial )
{
}
from.Send(new AsciiMessage(Serial, ItemID, MessageType.Label, hue, 3, "", "a charred corpse"));
}
public override void Open( Mobile from, bool checkSelfLoot )
{
if ( !from.InRange( GetWorldLocation(), 2 ) )
return;
public override void Open(Mobile from, bool checkSelfLoot)
{
if (!from.InRange(GetWorldLocation(), 2))
return;
if ( from is PlayerMobile player )
{
QuestSystem qs = player.Quest;
if (from is PlayerMobile player)
{
QuestSystem qs = player.Quest;
if ( qs is WitchApprenticeQuest )
{
if ( qs.FindObjective( typeof( FindApprenticeObjective ) ) is FindApprenticeObjective obj && !obj.Completed )
{
if ( obj.Corpse == this )
{
obj.Complete();
Delete();
}
else
{
SendLocalizedMessageTo( from, 1055047 ); // You examine the corpse, but it doesn't fit the description of the particular apprentice the Hag tasked you with finding.
}
if (qs is WitchApprenticeQuest)
if (qs.FindObjective(typeof(FindApprenticeObjective)) is FindApprenticeObjective obj && !obj.Completed)
{
if (obj.Corpse == this)
{
obj.Complete();
Delete();
}
else
{
SendLocalizedMessageTo(from,
1055047); // You examine the corpse, but it doesn't fit the description of the particular apprentice the Hag tasked you with finding.
}
return;
}
}
}
return;
}
}
SendLocalizedMessageTo( from, 1055048 ); // You examine the corpse, but find nothing of interest.
}
SendLocalizedMessageTo(from, 1055048); // You examine the corpse, but find nothing of interest.
}
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();
}
}
}

55
Scripts/Engines/Quests/Witch Apprentice/Items/HagCauldron.cs
View file

@ -1,37 +1,36 @@
namespace Server.Items
{
public class HagCauldron : BaseAddon
{
public class HagCauldron : BaseAddon
{
[Constructible]
public HagCauldron()
{
AddonComponent pot;
pot = new AddonComponent(2420);
AddComponent(pot, 0, 0, 0); //pot w/ support
[Constructible]
public HagCauldron()
{
AddonComponent pot;
pot = new AddonComponent(2420);
AddComponent(pot, 0, 0, 0); //pot w/ support
AddonComponent fire;
fire = new AddonComponent(4012); //fire pit
fire.Light = LightType.Circle150;
AddComponent(fire, 0, 0, 0);
}
AddonComponent fire;
fire = new AddonComponent(4012); //fire pit
fire.Light = LightType.Circle150;
AddComponent(fire, 0, 0, 0);
}
public HagCauldron( Serial serial ) : base( serial )
{
}
public HagCauldron(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(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();
}
}
}

131
Scripts/Engines/Quests/Witch Apprentice/Items/HagStew.cs
View file

@ -2,73 +2,72 @@ using System;
namespace Server.Items
{
public class HagStew : BaseAddon
{
public class HagStew : BaseAddon
{
[Constructible]
public HagStew()
{
AddonComponent stew;
stew = new AddonComponent(2416);
stew.Name = "stew";
stew.Visible = true;
AddComponent(stew, 0, 0, -7); //stew
}
[Constructible]
public HagStew()
public HagStew(Serial serial) : base(serial)
{
}
public override void OnComponentUsed(AddonComponent stew, Mobile from)
{
if (!from.InRange(GetWorldLocation(), 2))
{
from.SendMessage("You are too far away.");
}
else
{
stew.Visible = false;
BreadLoaf hagstew = new BreadLoaf(); //this decides your fillrate
hagstew.Eat(from);
Timer m_timer = new ShowStew(stew);
m_timer.Start();
}
}
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();
}
public class ShowStew : Timer
{
private AddonComponent stew;
public ShowStew(AddonComponent ac) : base(TimeSpan.FromSeconds(30))
{
stew = ac;
Priority = TimerPriority.OneSecond;
}
protected override void OnTick()
{
if (stew.Visible == false)
{
AddonComponent stew;
stew = new AddonComponent(2416);
stew.Name = "stew";
stew.Visible = true;
AddComponent(stew, 0, 0, -7); //stew
Stop();
stew.Visible = true;
}
public override void OnComponentUsed(AddonComponent stew, Mobile from)
{
if (!from.InRange(GetWorldLocation(), 2))
from.SendMessage("You are too far away.");
else
{
{
stew.Visible = false;
BreadLoaf hagstew = new BreadLoaf(); //this decides your fillrate
hagstew.Eat(from);
Timer m_timer = new ShowStew(stew);
m_timer.Start();
}
}
}
public class ShowStew : Timer
{
private AddonComponent stew;
public ShowStew(AddonComponent ac) : base(TimeSpan.FromSeconds(30))
{
stew = ac;
Priority = TimerPriority.OneSecond;
}
protected override void OnTick()
{
if ( stew.Visible == false )
{
Stop();
stew.Visible = true;
}
}
}
public HagStew( Serial serial ) : base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
}
}
}
}

130
Scripts/Engines/Quests/Witch Apprentice/Items/HangoverCure.cs
View file

@ -1,81 +1,81 @@
namespace Server.Engines.Quests.Hag
{
public class HangoverCure : Item
{
public override int LabelNumber => 1055060; // Grizelda's Extra Strength Hangover Cure
public class HangoverCure : Item
{
[Constructible]
public HangoverCure() : base(0xE2B)
{
Weight = 1.0;
Hue = 0x2D;
[CommandProperty( AccessLevel.GameMaster )]
public int Uses { get; set; }
Uses = 20;
}
[Constructible]
public HangoverCure() : base( 0xE2B )
{
Weight = 1.0;
Hue = 0x2D;
public HangoverCure(Serial serial) : base(serial)
{
}
Uses = 20;
}
public override int LabelNumber => 1055060; // Grizelda's Extra Strength Hangover Cure
public override void OnDoubleClick( Mobile from )
{
if ( !IsChildOf( from.Backpack ) )
{
SendLocalizedMessageTo( from, 1042038 ); // You must have the object in your backpack to use it.
return;
}
[CommandProperty(AccessLevel.GameMaster)]
public int Uses{ get; set; }
if ( Uses > 0 )
{
from.PlaySound( 0x2D6 );
from.SendLocalizedMessage( 501206 ); // An awful taste fills your mouth.
public override void OnDoubleClick(Mobile from)
{
if (!IsChildOf(from.Backpack))
{
SendLocalizedMessageTo(from, 1042038); // You must have the object in your backpack to use it.
return;
}
if ( from.BAC > 0 )
{
from.BAC = 0;
from.SendLocalizedMessage( 501204 ); // You are now sober!
}
if (Uses > 0)
{
from.PlaySound(0x2D6);
from.SendLocalizedMessage(501206); // An awful taste fills your mouth.
Uses--;
}
else
{
Delete();
from.SendLocalizedMessage( 501201 ); // There wasn't enough left to have any effect.
}
}
if (from.BAC > 0)
{
from.BAC = 0;
from.SendLocalizedMessage(501204); // You are now sober!
}
public HangoverCure( Serial serial ) : base( serial )
{
}
Uses--;
}
else
{
Delete();
from.SendLocalizedMessage(501201); // There wasn't enough left to have any effect.
}
}
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( Uses );
}
writer.WriteEncodedInt(Uses);
}
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:
{
Uses = reader.ReadEncodedInt();
break;
}
case 0:
{
Uses = 20;
break;
}
}
}
}
}
switch (version)
{
case 1:
{
Uses = reader.ReadEncodedInt();
break;
}
case 0:
{
Uses = 20;
break;
}
}
}
}
}

110
Scripts/Engines/Quests/Witch Apprentice/Items/MagicFlute.cs
View file

@ -2,69 +2,69 @@ using Server.Mobiles;
namespace Server.Engines.Quests.Hag
{
public class MagicFlute : Item
{
public override int LabelNumber => 1055051; // magic flute
public class MagicFlute : Item
{
[Constructible]
public MagicFlute() : base(0x1421)
{
Hue = 0x8AB;
}
[Constructible]
public MagicFlute() : base( 0x1421 )
{
Hue = 0x8AB;
}
public MagicFlute(Serial serial) : base(serial)
{
}
public override void OnDoubleClick( Mobile from )
{
if ( !IsChildOf( from.Backpack ) )
{
SendLocalizedMessageTo( from, 1042292 ); // You must have the object in your backpack to use it.
return;
}
public override int LabelNumber => 1055051; // magic flute
from.PlaySound( 0x3D );
public override void OnDoubleClick(Mobile from)
{
if (!IsChildOf(from.Backpack))
{
SendLocalizedMessageTo(from, 1042292); // You must have the object in your backpack to use it.
return;
}
if ( from is PlayerMobile player )
{
QuestSystem qs = player.Quest;
from.PlaySound(0x3D);
if ( qs is WitchApprenticeQuest )
{
if ( qs.FindObjective( typeof( FindZeefzorpulObjective ) ) is FindZeefzorpulObjective obj && !obj.Completed )
{
if ( ( player.Map != Map.Trammel && player.Map != Map.Felucca ) || !player.InRange( obj.ImpLocation, 8 ) )
{
player.SendLocalizedMessage( 1055053 ); // Nothing happens. Zeefzorpul must not be hiding in this area.
}
else if ( player.InRange( obj.ImpLocation, 4 ) )
{
Delete();
if (from is PlayerMobile player)
{
QuestSystem qs = player.Quest;
obj.Complete();
}
else
{
player.SendLocalizedMessage( 1055052 ); // The flute sparkles. Zeefzorpul must be in a good hiding place nearby.
}
}
}
}
}
if (qs is WitchApprenticeQuest)
if (qs.FindObjective(typeof(FindZeefzorpulObjective)) is FindZeefzorpulObjective obj && !obj.Completed)
{
if (player.Map != Map.Trammel && player.Map != Map.Felucca || !player.InRange(obj.ImpLocation, 8))
{
player.SendLocalizedMessage(
1055053); // Nothing happens. Zeefzorpul must not be hiding in this area.
}
else if (player.InRange(obj.ImpLocation, 4))
{
Delete();
public MagicFlute( Serial serial ) : base( serial )
{
}
obj.Complete();
}
else
{
player.SendLocalizedMessage(
1055052); // The flute sparkles. Zeefzorpul must be in a good hiding place nearby.
}
}
}
}
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();
}
}
}

46
Scripts/Engines/Quests/Witch Apprentice/Items/MoonfireBrew.cs
View file

@ -1,31 +1,31 @@
namespace Server.Engines.Quests.Hag
{
public class MoonfireBrew : Item
{
public override int LabelNumber => 1055065; // a bottle of magical moonfire brew
public class MoonfireBrew : Item
{
[Constructible]
public MoonfireBrew() : base(0xF04)
{
Weight = 1.0;
}
[Constructible]
public MoonfireBrew() : base( 0xF04 )
{
Weight = 1.0;
}
public MoonfireBrew(Serial serial) : base(serial)
{
}
public MoonfireBrew( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1055065; // a bottle of magical moonfire brew
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();
}
}
}