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

ugh @ baseescortable formatting

Browse source
This commit is contained in:
mark 2009-09-06 03:45:12 +00:00
parent 06e5c8b732
commit 1320f14adf
13 changed files with 723 additions and 612 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Scripts/Mobiles/Monsters/Ants/BlackSolenQueen.cs
View file

@ -107,7 +107,7 @@ namespace Server.Mobiles
}
else if ( from != null && from != this && InRange( from, 1 ) )
{
SpillAcid( TimeSpan.FromSeconds( 10 ), 30, 30, from );
SpillAcid( from, 1 );
}
}
@ -116,7 +116,7 @@ namespace Server.Mobiles
public override bool OnBeforeDeath()
{
SpillAcid( TimeSpan.FromSeconds( 10 ), 30, 30, 1, 4 );
SpillAcid( 4 );
return base.OnBeforeDeath();
}

4
Scripts/Mobiles/Monsters/Ants/BlackSolenWarrior.cs
View file

@ -108,7 +108,7 @@ namespace Server.Mobiles
}
else if ( from != null && from != this && InRange( from, 1 ) )
{
SpillAcid( TimeSpan.FromSeconds( 10 ), 30, 30, from );
SpillAcid( from, 1 );
}
}
@ -117,7 +117,7 @@ namespace Server.Mobiles
public override bool OnBeforeDeath()
{
SpillAcid( TimeSpan.FromSeconds( 10 ), 30, 30, 1, 4 );
SpillAcid( 4 );
return base.OnBeforeDeath();
}

4
Scripts/Mobiles/Monsters/Ants/RedSolenQueen.cs
View file

@ -107,7 +107,7 @@ namespace Server.Mobiles
}
else if ( from != null && from != this && InRange( from, 1 ) )
{
SpillAcid( TimeSpan.FromSeconds( 10 ), 30, 30, from );
SpillAcid( from, 1 );
}
}
@ -116,7 +116,7 @@ namespace Server.Mobiles
public override bool OnBeforeDeath()
{
SpillAcid( TimeSpan.FromSeconds( 10 ), 30, 30, 1, 4 );
SpillAcid( 4 );
return base.OnBeforeDeath();
}

4
Scripts/Mobiles/Monsters/Ants/RedSolenWarrior.cs
View file

@ -107,7 +107,7 @@ namespace Server.Mobiles
}
else if ( from != null && from != this && InRange( from, 1 ) )
{
SpillAcid( TimeSpan.FromSeconds( 10 ), 30, 30, from );
SpillAcid( from, 1 );
}
}
@ -116,7 +116,7 @@ namespace Server.Mobiles
public override bool OnBeforeDeath()
{
SpillAcid( TimeSpan.FromSeconds( 10 ), 30, 30, 1, 4 );
SpillAcid( 4 );
return base.OnBeforeDeath();
}

1037
Scripts/Mobiles/Townfolk/BaseEscortable.cs
View file

File diff suppressed because it is too large Load diff

21
Scripts/Mobiles/Townfolk/SeekerOfAdventure.cs
View file

@ -8,15 +8,24 @@ namespace Server.Mobiles
public class SeekerOfAdventure : BaseEscortable
{
private static string[] m_Dungeons = new string[]
{
"Covetous", "Deceit", "Despise",
"Destard", "Hythloth", "Shame",
"Wrong"
};
{
"Covetous", "Deceit", "Despise",
"Destard", "Hythloth", "Shame", // Old Code for Pre-ML shards.
"Wrong"
};
private static string[] m_MLDestinations = new string[]
{
"Cove", "Serpent's Hold", "Jhelom", // ML List
"Nujel'm"
};
public override string[] GetPossibleDestinations()
{
return m_Dungeons;
if ( Core.ML )
return m_MLDestinations;
else
return m_Dungeons;
}
[Constructable]

16
Scripts/Mobiles/Vendors/PlayerVendor.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Globalization;
using Server;
using Server.Items;
using Server.Mobiles;
@ -33,6 +34,17 @@ namespace Server.Mobiles
public Item Item{ get{ return m_Item; } }
public int Price{ get{ return m_Price; } }
public string FormattedPrice
{
get
{
if ( Core.ML )
return m_Price.ToString( "N0", CultureInfo.GetCultureInfo( "en-US" ) );
return m_Price.ToString();
}
}
public string Description
{
get{ return m_Description; }
@ -197,7 +209,7 @@ namespace Server.Mobiles
else if ( vi.IsForFree )
list.Add( 1043306 ); // Price: FREE!
else
list.Add( 1043304, vi.Price.ToString() ); // Price: ~1_COST~
list.Add( 1043304, vi.FormattedPrice ); // Price: ~1_COST~
}
public override void GetChildProperties( ObjectPropertyList list, Item item )
@ -230,7 +242,7 @@ namespace Server.Mobiles
else if ( vi.IsForFree )
item.LabelTo( from, 1043306 ); // Price: FREE!
else
item.LabelTo( from, 1043304, vi.Price.ToString() ); // Price: ~1_COST~
item.LabelTo( from, 1043304, vi.FormattedPrice ); // Price: ~1_COST~
if ( !String.IsNullOrEmpty( vi.Description ) )
{