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

Browse source
This commit is contained in:
mark 2009-06-28 03:36:42 +00:00
parent c63a5f13fa
commit 2204d5fb86
86 changed files with 1077 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs
View file

@ -146,6 +146,8 @@ namespace Server.Items
public class TrophyAddon : Item, IAddon
{
public override bool ForceShowProperties { get { return ObjectPropertyList.Enabled; } }
private int m_WestID;
private int m_NorthID;
private int m_DeedNumber;

14
Scripts/Items/Skill Items/Magical/Potions/BasePotion.cs
View file

@ -134,12 +134,20 @@ namespace Server.Items
m.Animate( 34, 5, 1, true, false, 0 );
}
public static int EnhancePotions( Mobile m )
{
int EP = AosAttributes.GetValue( m, AosAttribute.EnhancePotions );
if ( Core.ML && EP > 50 )
EP = 50;
return EP;
}
public static TimeSpan Scale( Mobile m, TimeSpan v )
{
if ( !Core.AOS )
return v;
double scalar = 1.0 + (0.01 * AosAttributes.GetValue( m, AosAttribute.EnhancePotions ));
double scalar = 1.0 + ( 0.01 * EnhancePotions( m ) );
return TimeSpan.FromSeconds( v.TotalSeconds * scalar );
}
@ -149,7 +157,7 @@ namespace Server.Items
if ( !Core.AOS )
return v;
double scalar = 1.0 + (0.01 * AosAttributes.GetValue( m, AosAttribute.EnhancePotions ));
double scalar = 1.0 + ( 0.01 * EnhancePotions( m ) );
return v * scalar;
}
@ -159,7 +167,7 @@ namespace Server.Items
if ( !Core.AOS )
return v;
return AOS.Scale( v, 100 + AosAttributes.GetValue( m, AosAttribute.EnhancePotions ) );
return AOS.Scale( v, 100 + EnhancePotions( m ) );
}
public override bool StackWith( Mobile from, Item dropped, bool playSound )

24
Scripts/Items/Skill Items/Magical/Runebook.cs
View file

@ -276,7 +276,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
if ( from.InRange( GetWorldLocation(), 1 ) )
if ( from.InRange( GetWorldLocation(), (Core.ML ? 3 : 1) ) )
{
if ( DateTime.Now < NextUse )
{
@ -294,22 +294,22 @@ namespace Server.Items
NextUse = DateTime.Now + UseDelay;
}
public override void OnAfterDuped( Item newItem )
{
Runebook book = newItem as Runebook;
public override void OnAfterDuped( Item newItem )
{
Runebook book = newItem as Runebook;
if ( book == null )
return;
if ( book == null )
return;
book.m_Entries = new List<RunebookEntry>();
for ( int i = 0; i < m_Entries.Count; i++ )
{
RunebookEntry entry = m_Entries[i];
for ( int i = 0; i < m_Entries.Count; i++ )
{
RunebookEntry entry = m_Entries[i];
book.m_Entries.Add( new RunebookEntry( entry.Location, entry.Map, entry.Description, entry.House ) );
}
}
book.m_Entries.Add( new RunebookEntry( entry.Location, entry.Map, entry.Description, entry.House ) );
}
}
public bool CheckAccess( Mobile m )
{

16
Scripts/Items/Skill Items/Magical/Scrolls/SpellweavingScrolls.cs
View file

@ -16,6 +16,7 @@ namespace Server.Items
public ArcaneCircleScroll( int amount )
: base( 600, 0x2D51, amount )
{
Hue = 0x8FD;
}
public ArcaneCircleScroll( Serial serial )
@ -50,6 +51,7 @@ namespace Server.Items
public GiftOfRenewalScroll( int amount )
: base( 601, 0x2D52, amount )
{
Hue = 0x8FD;
}
public GiftOfRenewalScroll( Serial serial )
@ -84,6 +86,7 @@ namespace Server.Items
public ImmolatingWeaponScroll( int amount )
: base( 602, 0x2D53, amount )
{
Hue = 0x8FD;
}
public ImmolatingWeaponScroll( Serial serial )
@ -118,6 +121,7 @@ namespace Server.Items
public AttuneWeaponScroll( int amount )
: base( 603, 0x2D54, amount )
{
Hue = 0x8FD;
}
public AttuneWeaponScroll( Serial serial )
@ -152,6 +156,7 @@ namespace Server.Items
public ThunderstormScroll( int amount )
: base( 604, 0x2D55, amount )
{
Hue = 0x8FD;
}
public ThunderstormScroll( Serial serial )
@ -186,6 +191,7 @@ namespace Server.Items
public NatureFuryScroll( int amount )
: base( 605, 0x2D56, amount )
{
Hue = 0x8FD;
}
public NatureFuryScroll( Serial serial )
@ -220,6 +226,7 @@ namespace Server.Items
public SummonFeyScroll( int amount )
: base( 606, 0x2D57, amount )
{
Hue = 0x8FD;
}
public SummonFeyScroll( Serial serial )
@ -254,6 +261,7 @@ namespace Server.Items
public SummonFiendScroll( int amount )
: base( 607, 0x2D58, amount )
{
Hue = 0x8FD;
}
public SummonFiendScroll( Serial serial )
@ -288,6 +296,7 @@ namespace Server.Items
public ReaperFormScroll( int amount )
: base( 608, 0x2D59, amount )
{
Hue = 0x8FD;
}
public ReaperFormScroll( Serial serial )
@ -322,6 +331,7 @@ namespace Server.Items
public WildfireScroll( int amount )
: base( 609, 0x2D5A, amount )
{
Hue = 0x8FD;
}
public WildfireScroll( Serial serial )
@ -356,6 +366,7 @@ namespace Server.Items
public EssenceOfWindScroll( int amount )
: base( 610, 0x2D5B, amount )
{
Hue = 0x8FD;
}
public EssenceOfWindScroll( Serial serial )
@ -390,6 +401,7 @@ namespace Server.Items
public DryadAllureScroll( int amount )
: base( 611, 0x2D5C, amount )
{
Hue = 0x8FD;
}
public DryadAllureScroll( Serial serial )
@ -424,6 +436,7 @@ namespace Server.Items
public EtherealVoyageScroll( int amount )
: base( 612, 0x2D5D, amount )
{
Hue = 0x8FD;
}
public EtherealVoyageScroll( Serial serial )
@ -458,6 +471,7 @@ namespace Server.Items
public WordOfDeathScroll( int amount )
: base( 613, 0x2D5E, amount )
{
Hue = 0x8FD;
}
public WordOfDeathScroll( Serial serial )
@ -492,6 +506,7 @@ namespace Server.Items
public GiftOfLifeScroll( int amount )
: base( 614, 0x2D5F, amount )
{
Hue = 0x8FD;
}
public GiftOfLifeScroll( Serial serial )
@ -526,6 +541,7 @@ namespace Server.Items
public ArcaneEmpowermentScroll( int amount )
: base( 615, 0x2D60, amount )
{
Hue = 0x8FD;
}
public ArcaneEmpowermentScroll( Serial serial )

1
Scripts/Items/Skill Items/Ninjitsu/EggBomb.cs
View file

@ -8,6 +8,7 @@ namespace Server.Items
[Constructable]
public EggBomb() : base( 0x2809 )
{
Stackable = Core.ML;
Weight = 1.0;
}

1
Scripts/Items/Skill Items/Ninjitsu/SmokeBomb.cs
View file

@ -8,6 +8,7 @@ namespace Server.Items
[Constructable]
public SmokeBomb() : base( 0x2808 )
{
Stackable = Core.ML;
Weight = 1.0;
}

2
Scripts/Items/Skill Items/Specialized/Sand.cs
View file

@ -26,7 +26,7 @@ namespace Server.Items
[Constructable]
public Sand( int amount ) : base( 0x11EA )
{
Stackable = false;
Stackable = Core.ML;
Weight = 1.0;
}

8
Scripts/Items/Skill Items/Tools/BaseRunicTool.cs
View file

@ -492,7 +492,13 @@ namespace Server.Items
/* Begin Sheilds */
case 0: ApplyAttribute( primary, min, max, AosAttribute.SpellChanneling, 1, 1 ); break;
case 1: ApplyAttribute( primary, min, max, AosAttribute.DefendChance, 1, 15 ); break;
case 2: ApplyAttribute( primary, min, max, AosAttribute.AttackChance, 1, 15 ); break;
case 2:
if (Core.ML) {
ApplyAttribute( primary, min, max, AosAttribute.ReflectPhysical, 1, 15 );
} else {
ApplyAttribute( primary, min, max, AosAttribute.AttackChance, 1, 15 );
}
break;
case 3: ApplyAttribute( primary, min, max, AosAttribute.CastSpeed, 1, 1 ); break;
/* Begin Armor */
case 4: ApplyAttribute( secondary, min, max, AosArmorAttribute.LowerStatReq, 10, 100, 10 ); break;