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

169
Scripts/Items/Skill Items/Fishing/Misc/MessageInABottle.cs
View file

@ -1,107 +1,108 @@
using System;
using Server.Network;
namespace Server.Items
{
public class MessageInABottle : Item
{
public static int GetRandomLevel()
{
if ( Core.AOS && 1 > Utility.Random( 25 ) )
return 4; // ancient
public class MessageInABottle : Item
{
private int m_Level;
return Utility.RandomMinMax( 1, 3 );
}
[Constructible]
public MessageInABottle() : this(Map.Trammel)
{
}
public override int LabelNumber => 1041080; // a message in a bottle
public MessageInABottle(Map map) : this(map, GetRandomLevel())
{
}
private int m_Level;
[Constructible]
public MessageInABottle(Map map, int level) : base(0x099F)
{
Weight = 1.0;
TargetMap = map;
m_Level = level;
}
[CommandProperty( AccessLevel.GameMaster )]
public Map TargetMap { get; set; }
public MessageInABottle(Serial serial) : base(serial)
{
}
[CommandProperty( AccessLevel.GameMaster )]
public int Level
{
get => m_Level;
set => m_Level = Math.Max( 1, Math.Min( value, 4 ) );
}
public override int LabelNumber => 1041080; // a message in a bottle
[Constructible]
public MessageInABottle() : this( Map.Trammel )
{
}
[CommandProperty(AccessLevel.GameMaster)]
public Map TargetMap{ get; set; }
public MessageInABottle( Map map ) : this( map, GetRandomLevel() )
{
}
[CommandProperty(AccessLevel.GameMaster)]
public int Level
{
get => m_Level;
set => m_Level = Math.Max(1, Math.Min(value, 4));
}
[Constructible]
public MessageInABottle( Map map, int level ) : base( 0x099F )
{
Weight = 1.0;
TargetMap = map;
m_Level = level;
}
public static int GetRandomLevel()
{
if (Core.AOS && 1 > Utility.Random(25))
return 4; // ancient
public MessageInABottle( Serial serial ) : base( serial )
{
}
return Utility.RandomMinMax(1, 3);
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 3 ); // version
writer.Write(3); // version
writer.Write( (int) m_Level );
writer.Write(m_Level);
writer.Write( TargetMap );
}
writer.Write(TargetMap);
}
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 3:
case 2:
{
m_Level = reader.ReadInt();
goto case 1;
}
case 1:
{
TargetMap = reader.ReadMap();
break;
}
case 0:
{
TargetMap = Map.Trammel;
break;
}
}
switch (version)
{
case 3:
case 2:
{
m_Level = reader.ReadInt();
goto case 1;
}
case 1:
{
TargetMap = reader.ReadMap();
break;
}
case 0:
{
TargetMap = Map.Trammel;
break;
}
}
if ( version < 2 )
m_Level = GetRandomLevel();
if (version < 2)
m_Level = GetRandomLevel();
if ( version < 3 && TargetMap == Map.Tokuno )
TargetMap = Map.Trammel;
}
if (version < 3 && TargetMap == Map.Tokuno)
TargetMap = Map.Trammel;
}
public override void OnDoubleClick( Mobile from )
{
if ( IsChildOf( from.Backpack ) )
{
ReplaceWith( new SOS( TargetMap, m_Level ) );
from.LocalOverheadMessage( Network.MessageType.Regular, 0x3B2, 501891 ); // You extract the message from the bottle.
}
else
{
from.SendLocalizedMessage( 1042001 ); // That must be in your pack for you to use it.
}
}
}
}
public override void OnDoubleClick(Mobile from)
{
if (IsChildOf(from.Backpack))
{
ReplaceWith(new SOS(TargetMap, m_Level));
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 501891); // You extract the message from the bottle.
}
else
{
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
}
}
}