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

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

View file

@ -3,105 +3,105 @@ using Server.Commands.Generic;
namespace Server.Items
{
public class ToggleItem : Item
{
public class ToggleCommand : BaseCommand
{
public ToggleCommand()
{
AccessLevel = AccessLevel.GameMaster;
Supports = CommandSupport.AllItems;
Commands = new[]{ "Toggle" };
ObjectTypes = ObjectTypes.Items;
Usage = "Toggle";
Description = "Toggles a targeted ToggleItem.";
}
public class ToggleItem : Item
{
[Constructible]
public ToggleItem(int inactiveItemID, int activeItemID, bool playersCanToggle = false)
: base(inactiveItemID)
{
Movable = false;
public override void Execute( CommandEventArgs e, object obj )
{
if ( obj is ToggleItem item )
{
item.Toggle();
AddResponse( "The item has been toggled." );
}
else
{
LogFailure( "That is not a ToggleItem." );
}
}
}
InactiveItemID = inactiveItemID;
ActiveItemID = activeItemID;
PlayersCanToggle = playersCanToggle;
}
public static void Initialize()
{
TargetCommands.Register( new ToggleCommand() );
}
public ToggleItem(Serial serial)
: base(serial)
{
}
[CommandProperty( AccessLevel.GameMaster )]
public int InactiveItemID { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public int InactiveItemID{ get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public int ActiveItemID { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public int ActiveItemID{ get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public bool PlayersCanToggle { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public bool PlayersCanToggle{ get; set; }
[Constructible]
public ToggleItem( int inactiveItemID, int activeItemID, bool playersCanToggle = false)
: base( inactiveItemID )
{
Movable = false;
public static void Initialize()
{
TargetCommands.Register(new ToggleCommand());
}
InactiveItemID = inactiveItemID;
ActiveItemID = activeItemID;
PlayersCanToggle = playersCanToggle;
}
public override void OnDoubleClick(Mobile from)
{
if (from.AccessLevel >= AccessLevel.GameMaster)
{
Toggle();
}
else if (PlayersCanToggle)
{
if (from.InRange(GetWorldLocation(), 1))
Toggle();
else
from.SendLocalizedMessage(500446); // That is too far away.
}
}
public override void OnDoubleClick( Mobile from )
{
if ( from.AccessLevel >= AccessLevel.GameMaster )
{
Toggle();
}
else if ( PlayersCanToggle )
{
if ( from.InRange( GetWorldLocation(), 1 ) )
Toggle();
else
from.SendLocalizedMessage( 500446 ); // That is too far away.
}
}
public void Toggle()
{
ItemID = ItemID == ActiveItemID ? InactiveItemID : ActiveItemID;
Visible = ItemID != 0x1;
}
public void Toggle()
{
ItemID = ( ItemID == ActiveItemID ) ? InactiveItemID : ActiveItemID;
Visible = ( ItemID != 0x1 );
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
public ToggleItem( Serial serial )
: base( serial )
{
}
writer.Write(0); // version
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write(InactiveItemID);
writer.Write(ActiveItemID);
writer.Write(PlayersCanToggle);
}
writer.Write( (int) 0 ); // version
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
writer.Write( InactiveItemID );
writer.Write( ActiveItemID );
writer.Write( PlayersCanToggle );
}
int version = reader.ReadInt();
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
InactiveItemID = reader.ReadInt();
ActiveItemID = reader.ReadInt();
PlayersCanToggle = reader.ReadBool();
}
int version = reader.ReadInt();
public class ToggleCommand : BaseCommand
{
public ToggleCommand()
{
AccessLevel = AccessLevel.GameMaster;
Supports = CommandSupport.AllItems;
Commands = new[] { "Toggle" };
ObjectTypes = ObjectTypes.Items;
Usage = "Toggle";
Description = "Toggles a targeted ToggleItem.";
}
InactiveItemID = reader.ReadInt();
ActiveItemID = reader.ReadInt();
PlayersCanToggle = reader.ReadBool();
}
}
}
public override void Execute(CommandEventArgs e, object obj)
{
if (obj is ToggleItem item)
{
item.Toggle();
AddResponse("The item has been toggled.");
}
else
{
LogFailure("That is not a ToggleItem.");
}
}
}
}
}