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

Formatting FIxes (#58)

Browse source
This commit is contained in:
Kamron Batman 2019-10-04 23:08:13 -07:00 • committed by GitHub
parent 57fb9fb525
commit 096d39609e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1318 changed files with 11633 additions and 22129 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Projects/Scripts/Holiday Stuff/Valentine/2010/Items/AnimatedHeartShapedBox.cs
View file

@ -4,10 +4,7 @@ namespace Server.Items
public class AnimatedHeartShapedBox : HeartShapedBox
{
[Constructible]
public AnimatedHeartShapedBox()
{
ItemID = 0x49CC;
}
public AnimatedHeartShapedBox() => ItemID = 0x49CC;
public AnimatedHeartShapedBox(Serial serial)
: base(serial)

4
Projects/Scripts/Holiday Stuff/Valentine/2012/Items/CupidStatue.cs
View file

@ -5,10 +5,8 @@ namespace Server.Items
{
[Constructible]
public CupidStatue()
: base(0x4F7D)
{
: base(0x4F7D) =>
LootType = LootType.Blessed;
}
public CupidStatue(Serial serial)
: base(serial)

190
Projects/Scripts/Holiday Stuff/Valentine/2012/Items/CupidsArrow.cs
View file

@ -3,127 +3,125 @@ using Server.Targeting;
namespace Server.Items
{
public class CupidsArrow : Item
{
// TODO: Check messages
public class CupidsArrow : Item
{
// TODO: Check messages
public override int LabelNumber => 1152270; // Cupid's Arrow 2012
public override int LabelNumber => 1152270; // Cupid's Arrow 2012
private string m_From;
private string m_To;
private string m_From;
private string m_To;
[CommandProperty( AccessLevel.GameMaster )]
public string From
{
get => m_From;
set { m_From = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public string From
{
get => m_From;
set { m_From = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public string To
{
get => m_To;
set { m_To = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public string To
{
get => m_To;
set { m_To = value; InvalidateProperties(); }
}
public bool IsSigned => ( m_From != null && m_To != null );
public bool IsSigned => ( m_From != null && m_To != null );
[Constructible]
public CupidsArrow()
: base( 0x4F7F )
{
LootType = LootType.Blessed;
}
[Constructible]
public CupidsArrow()
: base( 0x4F7F ) =>
LootType = LootType.Blessed;
public override void AddNameProperty( ObjectPropertyList list )
{
base.AddNameProperty( list );
public override void AddNameProperty( ObjectPropertyList list )
{
base.AddNameProperty( list );
if ( IsSigned )
list.Add( 1152273, $"{m_From}\t{m_To}"); // ~1_val~ is madly in love with ~2_val~
}
if ( IsSigned )
list.Add( 1152273, $"{m_From}\t{m_To}"); // ~1_val~ is madly in love with ~2_val~
}
public static bool CheckSeason( Mobile from )
{
if ( DateTime.UtcNow.Month == 2 )
return true;
public static bool CheckSeason( Mobile from )
{
if ( DateTime.UtcNow.Month == 2 )
return true;
from.SendLocalizedMessage( 1152318 ); // You may not use this item out of season.
return false;
}
from.SendLocalizedMessage( 1152318 ); // You may not use this item out of season.
return false;
}
public override void OnSingleClick( Mobile from )
{
base.OnSingleClick( from );
public override void OnSingleClick( Mobile from )
{
base.OnSingleClick( from );
if ( IsSigned )
LabelTo( from, 1152273, $"{m_From}\t{m_To}"); // ~1_val~ is madly in love with ~2_val~
}
if ( IsSigned )
LabelTo( from, 1152273, $"{m_From}\t{m_To}"); // ~1_val~ is madly in love with ~2_val~
}
public override void OnDoubleClick( Mobile from )
{
if ( IsSigned || !CheckSeason( from ) )
return;
public override void OnDoubleClick( Mobile from )
{
if ( IsSigned || !CheckSeason( from ) )
return;
if ( !IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1080063 ); // This must be in your backpack to use it.
return;
}
if ( !IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1080063 ); // This must be in your backpack to use it.
return;
}
from.BeginTarget( 10, false, TargetFlags.None, OnTarget );
from.SendMessage( "Who do you wish to use this on?" );
}
from.BeginTarget( 10, false, TargetFlags.None, OnTarget );
from.SendMessage( "Who do you wish to use this on?" );
}
private void OnTarget( Mobile from, object targeted )
{
if ( IsSigned || !IsChildOf( from.Backpack ) )
return;
private void OnTarget( Mobile from, object targeted )
{
if ( IsSigned || !IsChildOf( from.Backpack ) )
return;
if ( targeted is Mobile m )
{
if ( !m.Alive )
{
from.SendLocalizedMessage( 1152269 ); // That target is dead and even Cupid's arrow won't make them love you.
return;
}
if ( targeted is Mobile m )
{
if ( !m.Alive )
{
from.SendLocalizedMessage( 1152269 ); // That target is dead and even Cupid's arrow won't make them love you.
return;
}
m_From = from.Name;
m_To = m.Name;
m_From = from.Name;
m_To = m.Name;
InvalidateProperties();
InvalidateProperties();
from.SendMessage( "You inscribe the arrow." );
}
else
{
from.SendMessage( "That is not a person." );
}
}
from.SendMessage( "You inscribe the arrow." );
}
else
{
from.SendMessage( "That is not a person." );
}
}
public CupidsArrow( Serial serial )
: base( serial )
{
}
public CupidsArrow( Serial serial )
: base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( 0 );
writer.Write( 0 );
writer.Write( m_From );
writer.Write( m_To );
}
writer.Write( m_From );
writer.Write( m_To );
}
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();
m_From = Utility.Intern( reader.ReadString() );
m_To = Utility.Intern( reader.ReadString() );
}
}
m_From = Utility.Intern( reader.ReadString() );
m_To = Utility.Intern( reader.ReadString() );
}
}
}